[compass4nfv]Add gambia jobs

Change-Id: I0e9521a4b5dcb025464b6b193848454aacd5a86c
Signed-off-by: wutianwei <wutianwei1@huawei.com>

diff --git a/jjb/compass4nfv/compass-ci-jobs.yaml b/jjb/compass4nfv/compass-ci-jobs.yaml
index e5775b2..f93575d 100644 (file)
--- a/jjb/compass4nfv/compass-ci-jobs.yaml
+++ b/jjb/compass4nfv/compass-ci-jobs.yaml
@@ -13,14 +13,14 @@
       gs-pathname: ''
       ppa-pathname: '/{stream}'
       disabled: false
-      openstack-version: pike
-    fraser: &fraser
-      stream: fraser
+      openstack-version: queens
+    gambia: &gambia
+      stream: gambia
       branch: 'stable/{stream}'
       disabled: false
       gs-pathname: '/{stream}'
       ppa-pathname: '/{stream}'
-      openstack-version: pike
+      openstack-version: queens
     danube: &danube
       stream: danube
       branch: 'stable/{stream}'
@@ -45,11 +45,11 @@
       - baremetal:
           slave-label: compass-baremetal-branch
           os-version: 'xenial'
-          <<: *fraser
+          <<: *gambia
       - virtual:
           slave-label: compass-virtual-branch
           os-version: 'xenial'
-          <<: *fraser
+          <<: *gambia
       # -------------------------------
       #        master
       # -------------------------------
@@ -389,7 +389,7 @@
                 !include-raw-escape: ./compass-deploy.sh
       - conditional-step:
           condition-kind: regex-match
-          regex: (danube|fraser)
+          regex: (danube|gambia)
           label: '{stream}'
           steps:
             - shell:
@@ -767,98 +767,98 @@
       - timed: ''
 
 # -------------------
-# ha-baremetal-fraser
+# ha-baremetal-gambia
 # -------------------
 - trigger:
-    name: 'compass-os-nosdn-nofeature-ha-baremetal-fraser-trigger'
+    name: 'compass-os-nosdn-nofeature-ha-baremetal-gambia-trigger'
     triggers:
       - timed: '0 1 1-29/2 * *'
 - trigger:
-    name: 'compass-os-nosdn-openo-ha-baremetal-fraser-trigger'
+    name: 'compass-os-nosdn-openo-ha-baremetal-gambia-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-odl_l3-nofeature-ha-baremetal-fraser-trigger'
+    name: 'compass-os-odl_l3-nofeature-ha-baremetal-gambia-trigger'
     triggers:
       - timed: '0 21 2-30/2 * *'
 - trigger:
-    name: 'compass-os-onos-nofeature-ha-baremetal-fraser-trigger'
+    name: 'compass-os-onos-nofeature-ha-baremetal-gambia-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-ocl-nofeature-ha-baremetal-fraser-trigger'
+    name: 'compass-os-ocl-nofeature-ha-baremetal-gambia-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-onos-sfc-ha-baremetal-fraser-trigger'
+    name: 'compass-os-onos-sfc-ha-baremetal-gambia-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-odl_l2-moon-ha-baremetal-fraser-trigger'
+    name: 'compass-os-odl_l2-moon-ha-baremetal-gambia-trigger'
     triggers:
       - timed: ''  # '0 5 1-29/2 * *'
 - trigger:
-    name: 'compass-os-nosdn-kvm-ha-baremetal-fraser-trigger'
+    name: 'compass-os-nosdn-kvm-ha-baremetal-gambia-trigger'
     triggers:
       - timed: '0 13 2-30/2 * *'
 - trigger:
-    name: 'compass-os-nosdn-ovs_dpdk-ha-baremetal-fraser-trigger'
+    name: 'compass-os-nosdn-ovs_dpdk-ha-baremetal-gambia-trigger'
     triggers:
       - timed: '0 9 1-29/2 * *'
 - trigger:
-    name: 'compass-k8-nosdn-nofeature-ha-baremetal-fraser-trigger'
+    name: 'compass-k8-nosdn-nofeature-ha-baremetal-gambia-trigger'
     triggers:
       - timed: '0 5 1-29/2 * *'
 - trigger:
-    name: 'compass-os-odl-sfc-ha-baremetal-fraser-trigger'
+    name: 'compass-os-odl-sfc-ha-baremetal-gambia-trigger'
     triggers:
       - timed: '0 17 2-30/2 * *'
 - trigger:
-    name: 'compass-os-nosdn-bar-ha-baremetal-fraser-trigger'
+    name: 'compass-os-nosdn-bar-ha-baremetal-gambia-trigger'
     triggers:
       - timed: '0 21 1-29/2 * *'
 - trigger:
-    name: 'compass-k8-nosdn-stor4nfv-ha-baremetal-fraser-trigger'
+    name: 'compass-k8-nosdn-stor4nfv-ha-baremetal-gambia-trigger'
     triggers:
       - timed: '0 7 2-30/2 * *'
 - trigger:
-    name: 'compass-os-nosdn-stor4nfv-ha-baremetal-fraser-trigger'
+    name: 'compass-os-nosdn-stor4nfv-ha-baremetal-gambia-trigger'
     triggers:
       - timed: ''
 
 # ---------------------
-# noha-baremetal-fraser
+# noha-baremetal-gambia
 # ---------------------
 - trigger:
-    name: 'compass-os-nosdn-kvm-noha-baremetal-fraser-trigger'
+    name: 'compass-os-nosdn-kvm-noha-baremetal-gambia-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-nosdn-nofeature-noha-baremetal-fraser-trigger'
+    name: 'compass-os-nosdn-nofeature-noha-baremetal-gambia-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-odl_l3-nofeature-noha-baremetal-fraser-trigger'
+    name: 'compass-os-odl_l3-nofeature-noha-baremetal-gambia-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-odl_l2-moon-noha-baremetal-fraser-trigger'
+    name: 'compass-os-odl_l2-moon-noha-baremetal-gambia-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-odl-sfc-noha-baremetal-fraser-trigger'
+    name: 'compass-os-odl-sfc-noha-baremetal-gambia-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-fraser-trigger'
+    name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-gambia-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-nosdn-bar-noha-baremetal-fraser-trigger'
+    name: 'compass-os-nosdn-bar-noha-baremetal-gambia-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-k8-nosdn-stor4nfv-noha-baremetal-fraser-trigger'
+    name: 'compass-k8-nosdn-stor4nfv-noha-baremetal-gambia-trigger'
     triggers:
       - timed: ''
 
@@ -959,97 +959,97 @@
       - timed: '0 10 2-30/2 * *'
 
 # -----------------
-# ha-virtual-fraser
+# ha-virtual-gambia
 # -----------------
 - trigger:
-    name: 'compass-os-nosdn-nofeature-ha-virtual-fraser-trigger'
+    name: 'compass-os-nosdn-nofeature-ha-virtual-gambia-trigger'
     triggers:
       - timed: '0 23 1-29/2 * *'
 - trigger:
-    name: 'compass-os-nosdn-openo-ha-virtual-fraser-trigger'
+    name: 'compass-os-nosdn-openo-ha-virtual-gambia-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-odl_l3-nofeature-ha-virtual-fraser-trigger'
+    name: 'compass-os-odl_l3-nofeature-ha-virtual-gambia-trigger'
     triggers:
       - timed: '0 22 2-30/2 * *'
 - trigger:
-    name: 'compass-os-onos-nofeature-ha-virtual-fraser-trigger'
+    name: 'compass-os-onos-nofeature-ha-virtual-gambia-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-ocl-nofeature-ha-virtual-fraser-trigger'
+    name: 'compass-os-ocl-nofeature-ha-virtual-gambia-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-onos-sfc-ha-virtual-fraser-trigger'
+    name: 'compass-os-onos-sfc-ha-virtual-gambia-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-odl_l2-moon-ha-virtual-fraser-trigger'
+    name: 'compass-os-odl_l2-moon-ha-virtual-gambia-trigger'
     triggers:
       - timed: '0 20 1-29/2 * *'
 - trigger:
-    name: 'compass-os-nosdn-kvm-ha-virtual-fraser-trigger'
+    name: 'compass-os-nosdn-kvm-ha-virtual-gambia-trigger'
     triggers:
       - timed: '0 16 2-30/2 * *'
 - trigger:
-    name: 'compass-os-nosdn-ovs_dpdk-ha-virtual-fraser-trigger'
+    name: 'compass-os-nosdn-ovs_dpdk-ha-virtual-gambia-trigger'
     triggers:
       - timed: '0 14 1-29/2 * *'
 - trigger:
-    name: 'compass-os-odl-sfc-ha-virtual-fraser-trigger'
+    name: 'compass-os-odl-sfc-ha-virtual-gambia-trigger'
     triggers:
       - timed: '0 18 2-30/2 * *'
 - trigger:
-    name: 'compass-k8-nosdn-nofeature-ha-virtual-fraser-trigger'
+    name: 'compass-k8-nosdn-nofeature-ha-virtual-gambia-trigger'
     triggers:
       - timed: '5 1 2-30/2 * *'
 - trigger:
-    name: 'compass-os-nosdn-bar-ha-virtual-fraser-trigger'
+    name: 'compass-os-nosdn-bar-ha-virtual-gambia-trigger'
     triggers:
       - timed: '0 19 1-29/2 * *'
 - trigger:
-    name: 'compass-k8-nosdn-stor4nfv-ha-virtual-fraser-trigger'
+    name: 'compass-k8-nosdn-stor4nfv-ha-virtual-gambia-trigger'
     triggers:
       - timed: '0 15 1-29/2 * *'
 - trigger:
-    name: 'compass-os-nosdn-stor4nfv-ha-virtual-fraser-trigger'
+    name: 'compass-os-nosdn-stor4nfv-ha-virtual-gambia-trigger'
     triggers:
       - timed: ''
 
 # -------------------
-# noha-virtual-fraser
+# noha-virtual-gambia
 # -------------------
 - trigger:
-    name: 'compass-os-nosdn-kvm-noha-virtual-fraser-trigger'
+    name: 'compass-os-nosdn-kvm-noha-virtual-gambia-trigger'
     triggers:
       - timed: '0 15 1-29/2 * *'
 - trigger:
-    name: 'compass-os-nosdn-nofeature-noha-virtual-fraser-trigger'
+    name: 'compass-os-nosdn-nofeature-noha-virtual-gambia-trigger'
     triggers:
       - timed: '0 17 2-30/2 * *'
 - trigger:
-    name: 'compass-os-odl_l3-nofeature-noha-virtual-fraser-trigger'
+    name: 'compass-os-odl_l3-nofeature-noha-virtual-gambia-trigger'
     triggers:
       - timed: '0 23 1-29/2 * *'
 - trigger:
-    name: 'compass-os-odl_l2-moon-noha-virtual-fraser-trigger'
+    name: 'compass-os-odl_l2-moon-noha-virtual-gambia-trigger'
     triggers:
       - timed: '0 21 2-30/2 * *'
 - trigger:
-    name: 'compass-os-odl-sfc-noha-virtual-fraser-trigger'
+    name: 'compass-os-odl-sfc-noha-virtual-gambia-trigger'
     triggers:
       - timed: '0 19 1-29/2 * *'
 - trigger:
-    name: 'compass-os-nosdn-ovs_dpdk-noha-virtual-fraser-trigger'
+    name: 'compass-os-nosdn-ovs_dpdk-noha-virtual-gambia-trigger'
     triggers:
       - timed: '0 12 2-30/2 * *'
 - trigger:
-    name: 'compass-os-nosdn-bar-noha-virtual-fraser-trigger'
+    name: 'compass-os-nosdn-bar-noha-virtual-gambia-trigger'
     triggers:
       - timed: '0 12 1-29/2 * *'
 - trigger:
-    name: 'compass-k8-nosdn-stor4nfv-noha-virtual-fraser-trigger'
+    name: 'compass-k8-nosdn-stor4nfv-noha-virtual-gambia-trigger'
     triggers:
       - timed: '0 13 2-30/2 * *'

diff --git a/jjb/compass4nfv/compass-project-jobs.yaml b/jjb/compass4nfv/compass-project-jobs.yaml
index b857734..17745a2 100644 (file)
--- a/jjb/compass4nfv/compass-project-jobs.yaml
+++ b/jjb/compass4nfv/compass-project-jobs.yaml
@@ -20,7 +20,7 @@
           gs-pathname: '/{stream}'
           ppa-pathname: '/{stream}'
           disabled: false
-      - fraser:
+      - gambia:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           ppa-pathname: '/{stream}'

diff --git a/jjb/compass4nfv/compass-verify-jobs.yaml b/jjb/compass4nfv/compass-verify-jobs.yaml
index f0cda82..37e89e3 100644 (file)
--- a/jjb/compass4nfv/compass-verify-jobs.yaml
+++ b/jjb/compass4nfv/compass-verify-jobs.yaml
@@ -14,14 +14,14 @@
           gs-pathname: ''
           ppa-pathname: '/{stream}'
           disabled: false
-          openstack-version: 'pike'
+          openstack-version: 'queens'
           branch-type: 'master'
-      - fraser:
+      - gambia:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           ppa-pathname: '/{stream}'
           disabled: false
-          openstack-version: 'pike'
+          openstack-version: 'queens'
           branch-type: 'master'
 
     distro: