From: Trevor Bramwell <tbramwell@linuxfoundation.org>
Date: Fri, 14 Dec 2018 18:31:55 +0000 (+0000)
Subject: Merge "Tag SampleVNF for Gambia 7.1.0"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=adf46588b02ab3885cc1ab8a1fca2b6e35de1176;hp=74421bf1e98a66b6ffe8fdf046421d81857bdae9;p=releng.git

Merge "Tag SampleVNF for Gambia 7.1.0"
---

diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh
index 8bc5fa268..418b814e5 100755
--- a/jjb/fuel/fuel-deploy.sh
+++ b/jjb/fuel/fuel-deploy.sh
@@ -19,9 +19,6 @@ 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!"
diff --git a/releases/gambia/armband.yaml b/releases/gambia/armband.yaml
index 2e5f65af5..a523d5a40 100644
--- a/releases/gambia/armband.yaml
+++ b/releases/gambia/armband.yaml
@@ -15,6 +15,9 @@ releases:
   - version: opnfv-7.0.0
     location:
       armband: 30027365166c204bc03043234bbc6b0dfc2506fb
+  - version: opnfv-7.1.0
+    location:
+      armband: 5d8dd94fd0a50d9899010eb764e94abcb05b38c7
 
 branches:
   - name: stable/gambia
diff --git a/releases/gambia/doctor.yaml b/releases/gambia/doctor.yaml
index 3bf86a494..73707a63a 100644
--- a/releases/gambia/doctor.yaml
+++ b/releases/gambia/doctor.yaml
@@ -18,7 +18,9 @@ releases:
   - version: opnfv-7.0.1
     location:
       doctor: 9250be9b9f3e3fff0c5aa827daf89f0212ce964f
-
+  - version: opnfv-7.1.0
+    location:
+      doctor: e4ad3e7cf33e7696a08a52c4e167e240f56c7428
 branches:
   - name: stable/gambia
     location:
diff --git a/releases/gambia/fuel.yaml b/releases/gambia/fuel.yaml
index a958209b0..3a60effb8 100644
--- a/releases/gambia/fuel.yaml
+++ b/releases/gambia/fuel.yaml
@@ -20,5 +20,8 @@ releases:
   - version: opnfv-7.0.0
     location:
       fuel: 326c26b9b89c23e9775ba287d9da3bea35cfc437
+  - version: opnfv-7.1.0
+    location:
+      fuel: 79c56150533ec77e73bede445e74960affbbef67
 
 release-notes: https://opnfv-fuel.readthedocs.io/en/latest/release/release-notes/release-notes.html