summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2019-02-07 19:50:33 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2019-02-07 20:02:26 +0100
commita580cbeb402a0bb3cdcfffb41f889817b10be7c3 (patch)
tree1099d673fb9c5a3d0aadacdaab5502cd71839e6d /ci
parent32d3a5bbf288a4e45f32a29610e49d856a48434f (diff)
[docker] Add MaaS container build support
Change-Id: I7709c9ca9e701b656447154919eb084a710f49af Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'ci')
-rwxr-xr-xci/build.sh12
1 files changed, 11 insertions, 1 deletions
diff --git a/ci/build.sh b/ci/build.sh
index 108ce139a..8fab2ca01 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -33,6 +33,7 @@ DOCKER_DIR=$(cd "${MCP_REPO_ROOT_PATH}/docker"; pwd)
DOCKER_TAG=${1:-latest}
DOCKER_PUSH=${2---push} # pass an empty second arg to disable push
CACHE_INVALIDATE=${CACHE_INVALIDATE:-0}
+SALT_VERSION='stable 2017.7'
source "${DEPLOY_DIR}/globals.sh"
source "${DEPLOY_DIR}/lib.sh"
@@ -81,11 +82,20 @@ env PIPENV_HIDE_EMOJIS=1 python -m pipenv run \
--dist-rel=xenial \
--formula-rev=nightly \
--opnfv-tag="${DOCKER_TAG}" \
- --salt='stable 2017.7' \
+ --salt="${SALT_VERSION}" \
--build-arg-extra " \
CACHE_INVALIDATE=\"${CACHE_INVALIDATE}\"" \
${DOCKER_PUSH}
+env PIPENV_HIDE_EMOJIS=1 python -m pipenv run \
+ invoke build saltminion-maas \
+ --require 'maas' \
+ --dist=ubuntu \
+ --dist-rel=xenial \
+ --opnfv-tag="${DOCKER_TAG}" \
+ --salt="${SALT_VERSION}" \
+ ${DOCKER_PUSH}
+
popd > /dev/null
#