From a3d31a425e0bcfd040746ee21063e108e4487e07 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sun, 26 Jan 2020 16:58:13 +0100 Subject: 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 --- ci/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ci') 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} -- cgit 1.2.3-korg