diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-09-12 19:53:55 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-09-12 20:02:50 +0200 |
| commit | 13325ade9e4d2ea1046062e4efce9c54c8d877cd (patch) | |
| tree | 2012e711f8ef25d75b64f64679008bddb467a3ae | |
| parent | 674f0a09a4465d22a26e01a08270739eb489bdcd (diff) | |
[docker] Relax verify check for docker pull
JIRA: FUEL-383
Change-Id: I9203aa8d20def5b78d261f8c6847ddc576f0feb7
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
| -rwxr-xr-x | ci/build.sh | 3 | ||||
| -rw-r--r-- | mcp/scripts/lib.sh | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ci/build.sh b/ci/build.sh index fde0cfe4e..f15c52951 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -71,6 +71,7 @@ pushd "${DOCKER_DIR}" > /dev/null pipenv --two pipenv install pipenv install invoke +# shellcheck disable=SC2086 pipenv run \ invoke build saltmaster-reclass \ --require 'salt salt-formulas opnfv reclass tini-saltmaster' \ @@ -79,7 +80,7 @@ pipenv run \ --formula-rev=nightly \ --opnfv-tag="${DOCKER_TAG}" \ --salt='stable 2017.7' \ - "${DOCKER_PUSH}" + ${DOCKER_PUSH} popd > /dev/null diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh index 34229df08..df35f3706 100644 --- a/mcp/scripts/lib.sh +++ b/mcp/scripts/lib.sh @@ -497,7 +497,7 @@ function prepare_containers { docker-compose --version > /dev/null 2>&1 || COMPOSE_PREFIX="${image_dir}/" "${COMPOSE_PREFIX}docker-compose" -f docker-compose/docker-compose.yaml down - if [ ! "${MCP_DOCKER_TAG}" = 'verify' ]; then + if [[ ! "${MCP_DOCKER_TAG}" =~ 'verify' ]]; then "${COMPOSE_PREFIX}docker-compose" -f docker-compose/docker-compose.yaml pull fi sudo rm -rf "${image_dir}/"{salt,hosts,pki} "${image_dir}/nodes/"* |