From: Trevor Bramwell <tbramwell@linuxfoundation.org>
Date: Mon, 29 Oct 2018 15:27:27 +0000 (+0000)
Subject: Merge "[fuel] Define Docker tag for stable branches"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=70e0b787e9e72a7438be6069ab205c96fc18a53d;hp=e1cda14d7990bd7ea65c7952ed756976ce796544;p=releng.git

Merge "[fuel] Define Docker tag for stable branches"
---

diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh
index c0cdc3dc2..e66dbe1bd 100755
--- a/jjb/fuel/fuel-deploy.sh
+++ b/jjb/fuel/fuel-deploy.sh
@@ -19,6 +19,9 @@ LAB_NAME=${NODE_NAME/-*}
 # shellcheck disable=SC2153
 POD_NAME=${NODE_NAME/*-}
 
+# define Docker tag for stable branches
+[[ "${BRANCH}" != master ]] && export MCP_DOCKER_TAG=${BRANCH##*/}
+
 # Fuel currently supports arm, enea, ericsson, intel, lf, unh and zte labs
 if [[ ! "${LAB_NAME}" =~ (arm|enea|ericsson|intel|lf|unh|zte) ]]; then
     echo "Unsupported/unidentified lab ${LAB_NAME}. Cannot continue!"