From 546d3927a8ecd822b319a8eac1f98983df63eb3a Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 10 Sep 2018 03:26:46 +0200 Subject: [docker] Add MCP_DOCKER_TAG env var Allow skipping docker pull for verify jobs by setting the new env var to 'verify'. JIRA: FUEL-383 Change-Id: If8e2f66b5ccdac5c3911eeabfc2ba9c0eba61093 Signed-off-by: Alexandru Avadanii --- ci/deploy.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'ci') diff --git a/ci/deploy.sh b/ci/deploy.sh index f64b3b882..4a85412e1 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -137,6 +137,7 @@ USE_EXISTING_INFRA=${USE_EXISTING_INFRA:-0} NO_DEPLOY_ENVIRONMENT=${NO_DEPLOY_ENVIRONMENT:-0} ERASE_ENV=${ERASE_ENV:-0} MCP_VCP=${MCP_VCP:-1} +MCP_DOCKER_TAG=${MCP_DOCKER_TAG:-latest} source "${DEPLOY_DIR}/globals.sh" source "${DEPLOY_DIR}/lib.sh" @@ -264,7 +265,7 @@ export MAAS_SSH_KEY="$(cat "$(basename "${SSH_KEY}").pub")" MCP_DPDK_MODE=$([[ "$DEPLOY_SCENARIO" =~ ovs ]] && echo 1 || echo 0) # Expand jinja2 templates based on PDF data and env vars -export MCP_REPO_ROOT_PATH MCP_VCP MCP_DPDK_MODE MCP_STORAGE_DIR \ +export MCP_REPO_ROOT_PATH MCP_VCP MCP_DPDK_MODE MCP_STORAGE_DIR MCP_DOCKER_TAG \ MCP_JUMP_ARCH=$(uname -i) do_templates_scenario "${MCP_STORAGE_DIR}" "${TARGET_LAB}" "${TARGET_POD}" \ "${BASE_CONFIG_URI}" "${SCENARIO_DIR}" -- cgit 1.2.3-korg