diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2020-01-26 16:58:13 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2020-01-28 16:07:16 +0000 |
| commit | 7dffb549e8d34c53bfdd41ce28dfb33112140161 (patch) | |
| tree | fa3ec045a1617c3a64d9f4e90b734fd30ae8a0f8 /ci | |
| parent | 1a62d9d38fec1d85e5c4b2c195d40d16286ad2e5 (diff) | |
cfg01, mas01: Switch to Ubuntu Bionic
Pin salt-formula-nfs to a commit before 'mount.opts' was introduced.
Adapt salt-formula-maas bits for MaaS 2.4 (shipped by default in
Bionic) compatibility.
Change-Id: I42f436203d3fbdb777d6b3eff9ac185240088742
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit a3d31a425e0bcfd040746ee21063e108e4487e07)
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/build.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ci/build.sh b/ci/build.sh index 6119472ec..b24ac5b4e 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -78,7 +78,7 @@ env PIPENV_HIDE_EMOJIS=1 python3 -m pipenv run \ invoke build saltmaster-reclass \ --require 'salt salt-formulas opnfv reclass tini-saltmaster' \ --dist=ubuntu \ - --dist-rel=xenial \ + --dist-rel=bionic \ --formula-rev=nightly \ --opnfv-tag="${DOCKER_TAG}" \ --salt="${SALT_VERSION}" \ @@ -90,7 +90,7 @@ env PIPENV_HIDE_EMOJIS=1 python3 -m pipenv run \ invoke build saltminion-maas \ --require 'maas' \ --dist=ubuntu \ - --dist-rel=xenial \ + --dist-rel=bionic \ --opnfv-tag="${DOCKER_TAG}" \ --salt="${SALT_VERSION}" \ ${DOCKER_PUSH} |