From: Aric Gardner <agardner@linuxfoundation.org>
Date: Thu, 20 Dec 2018 23:44:12 +0000 (+0000)
Subject: Merge "auto: Update Gambia versions"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=c94c4f4bf1d220be7cf910b346d72114a05dfc72;hp=558856cd01c2bbc0a6209c17a387952c8e3afaaf;p=releng.git

Merge "auto: Update Gambia versions"
---

diff --git a/jjb/doctor/doctor.yaml b/jjb/doctor/doctor.yaml
index deccc32a4..71c519856 100644
--- a/jjb/doctor/doctor.yaml
+++ b/jjb/doctor/doctor.yaml
@@ -21,8 +21,10 @@
           disabled: false
 
     installer:
-      - 'apex'
-      - 'fuel'
+      - 'apex':
+          scenario: 'os-nosdn-nofeature-noha'
+      - 'fuel':
+          scenario: 'os-nosdn-nofeature-noha'
 
     arch:
       - 'x86_64'
@@ -117,6 +119,7 @@
       - 'doctor-slave-parameter'
       - 'doctor-parameter':
           inspector: '{inspector}'
+          scenario: '{scenario}'
           test_case: 'fault_management'
     scm:
       - git-scm-gerrit
@@ -141,6 +144,7 @@
       - 'doctor-slave-parameter'
       - 'doctor-parameter':
           inspector: '{inspector}'
+          scenario: '{scenario}'
           test_case: 'maintenance'
     scm:
       - git-scm-gerrit
@@ -165,6 +169,7 @@
       - 'doctor-slave-parameter'
       - 'doctor-parameter':
           inspector: '{inspector}'
+          scenario: '{scenario}'
           test_case: 'all'
     scm:
       - git-scm-gerrit
@@ -188,6 +193,10 @@
           name: TEST_CASE
           default: '{test_case}'
           description: 'test case: all, fault_management or maintenance'
+      - string:
+          name: DEPLOY_SCENARIO
+          default: '{scenario}'
+          description: 'Scenario to deploy and test'
 
 
 # -------------------------------
diff --git a/releases/gambia/barometer.yaml b/releases/gambia/barometer.yaml
index e5c9842bf..be492b138 100644
--- a/releases/gambia/barometer.yaml
+++ b/releases/gambia/barometer.yaml
@@ -3,6 +3,11 @@ project: barometer
 project-type: feature
 release-model: stable
 
+releases:
+  - version: opnfv-7.1.0
+    location:
+      barometer: 7cb6bd3a71c17a158f3057bfd4f1dabb0b28db35
+
 branches:
   - name: stable/gambia
     location:
diff --git a/releases/gambia/clover.yaml b/releases/gambia/clover.yaml
index 260d56c21..677a5c7a5 100644
--- a/releases/gambia/clover.yaml
+++ b/releases/gambia/clover.yaml
@@ -7,6 +7,9 @@ releases:
   - version: opnfv-7.0.0
     location:
       clover: b0231105e304d21f454bec58c4c2905f8d8b8e5f
+  - version: opnfv-7.1.0
+    location:
+      clover: fbc39f64e0f7c09558a5ce421719b63217c77d7b
 
 branches:
   - name: stable/gambia
diff --git a/releases/gambia/sdnvpn.yaml b/releases/gambia/sdnvpn.yaml
index c3ee8cad3..309523058 100644
--- a/releases/gambia/sdnvpn.yaml
+++ b/releases/gambia/sdnvpn.yaml
@@ -1,9 +1,27 @@
+# SPDX-License-Identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2018 The Linux Foundation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
 ---
 project: sdnvpn
 project-type: feature
 release-model: stable
 
+releases:
+  - version: opnfv-7.0.0
+    location:
+      sdnvpn: 6c2ec2eeedfc342e815b3dff7c190d8909e22e48
+  - version: opnfv-7.1.0
+    location:
+      sdnvpn: 3c74ef730c31343837b01c0e92e643d387ba8202
+
 branches:
   - name: stable/gambia
     location:
       sdnvpn: c05105a4f9f51f7bb31cad791e65d664e5a3bc4b
+
+release-notes: https://opnfv-sdnvpn.readthedocs.io/en/stable-gambia/release/release-notes
diff --git a/releases/gambia/yardstick.yaml b/releases/gambia/yardstick.yaml
index 2dc5ad6f4..60cd3e713 100644
--- a/releases/gambia/yardstick.yaml
+++ b/releases/gambia/yardstick.yaml
@@ -13,4 +13,8 @@ releases:
     location:
       yardstick: b9fa3eac6caf65a371f339fcbc3abc7cbe5b41cc
 
+  - version: opnfv-7.1.0
+    location:
+      yardstick: a1e5634d35ba5f0095fdd2777efa4042b1872127
+
 release-notes: https://opnfv-yardstick.readthedocs.io/en/stable-gambia/release/release-notes/