From: Trevor Bramwell <tbramwell@linuxfoundation.org>
Date: Fri, 14 Dec 2018 18:32:17 +0000 (+0000)
Subject: Merge "Add Bottlenecks gambia docker job"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=0fbf0b46a5a0ca94227921c39a3ae34e82b1ea80;hp=e747e3d5bc148ba77cfac9c7d004fd124b22de5a;p=releng.git

Merge "Add Bottlenecks gambia docker job"
---

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/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
diff --git a/releases/gambia/samplevnf.yaml b/releases/gambia/samplevnf.yaml
index a53eaa409..0d9500e7f 100644
--- a/releases/gambia/samplevnf.yaml
+++ b/releases/gambia/samplevnf.yaml
@@ -10,6 +10,9 @@ releases:
   - version: opnfv-7.0.1
     location:
       samplevnf: 9c29c90931b7fbc1690508769f1f7a7898dbf015
+  - version: opnfv-7.1.0
+    location:
+      samplevnf: 9c29c90931b7fbc1690508769f1f7a7898dbf015
 
 branches:
   - name: stable/gambia