aboutsummaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2020-01-26 16:58:13 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2020-01-28 14:58:26 +0100
commita3d31a425e0bcfd040746ee21063e108e4487e07 (patch)
treecabe6ad0fbabf03188cf1e2709cf6741c62b7ff3 /ci
parent6ecb2f9a9cd8b0c97002a7ff5583690856c11af0 (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>
Diffstat (limited to 'ci')
-rwxr-xr-xci/build.sh4
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}