Merge "[Compass4nfv] remove euphrates jobs create fraser jobs"

1 files changed, 58 insertions, 85 deletions

diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 44cb84d8e..0d5f92c2a 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -14,13 +14,13 @@
       ppa-pathname: '/{stream}'
       disabled: false
       openstack-version: pike
-    euphrates: &euphrates
-      stream: euphrates
+    fraser: &fraser
+      stream: fraser
       branch: 'stable/{stream}'
       disabled: false
       gs-pathname: '/{stream}'
       ppa-pathname: '/{stream}'
-      openstack-version: ocata
+      openstack-version: pike
     danube: &danube
       stream: danube
       branch: 'stable/{stream}'
@@ -45,11 +45,11 @@
       - baremetal:
           slave-label: compass-baremetal-branch
           os-version: 'xenial'
-          <<: *euphrates
+          <<: *fraser
       - virtual:
           slave-label: compass-virtual-branch
           os-version: 'xenial'
-          <<: *euphrates
+          <<: *fraser
       # -------------------------------
       #        master
       # -------------------------------
@@ -69,9 +69,6 @@
       - 'os-nosdn-nofeature-ha':
           disabled: false
           auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
-      - 'os-odl_l2-nofeature-ha':
-          disabled: false
-          auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
       - 'os-odl_l3-nofeature-ha':
           disabled: false
           auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
@@ -386,7 +383,7 @@
                 !include-raw-escape: ./compass-deploy.sh
       - conditional-step:
           condition-kind: regex-match
-          regex: (danube|euphrates)
+          regex: (danube|fraser)
           label: '{stream}'
           steps:
             - shell:
@@ -486,10 +483,6 @@
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-baremetal-centos-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
     name: 'compass-os-odl_l3-nofeature-ha-baremetal-centos-master-trigger'
     triggers:
       - timed: '0 15 * * *'
@@ -583,10 +576,6 @@
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-huawei-pod7-danube-trigger'
-    triggers:
-      - timed: ''  # '0 21 * * *'
-- trigger:
     name: 'compass-os-odl_l3-nofeature-ha-huawei-pod7-danube-trigger'
     triggers:
       - timed: ''  # '0 15 * * *'
@@ -679,10 +668,6 @@
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-baremetal-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
     name: 'compass-os-odl_l3-nofeature-ha-baremetal-master-trigger'
     triggers:
       - timed: '0 18 1-29/2 * *'
@@ -701,7 +686,7 @@
 - trigger:
     name: 'compass-os-odl_l2-moon-ha-baremetal-master-trigger'
     triggers:
-      - timed: '0 12 2-30/2 * *'
+      - timed: ''  # '0 12 2-30/2 * *'
 - trigger:
     name: 'compass-os-nosdn-kvm-ha-baremetal-master-trigger'
     triggers:
@@ -764,98 +749,94 @@
       - timed: ''
 
 # -------------------
-# ha-baremetal-euphrates
+# ha-baremetal-fraser
 # -------------------
 - trigger:
-    name: 'compass-os-nosdn-nofeature-ha-baremetal-euphrates-trigger'
+    name: 'compass-os-nosdn-nofeature-ha-baremetal-fraser-trigger'
     triggers:
       - timed: '0 1 1-29/2 * *'
 - trigger:
-    name: 'compass-os-nosdn-openo-ha-baremetal-euphrates-trigger'
+    name: 'compass-os-nosdn-openo-ha-baremetal-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-baremetal-euphrates-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'compass-os-odl_l3-nofeature-ha-baremetal-euphrates-trigger'
+    name: 'compass-os-odl_l3-nofeature-ha-baremetal-fraser-trigger'
     triggers:
       - timed: '0 21 2-30/2 * *'
 - trigger:
-    name: 'compass-os-onos-nofeature-ha-baremetal-euphrates-trigger'
+    name: 'compass-os-onos-nofeature-ha-baremetal-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-ocl-nofeature-ha-baremetal-euphrates-trigger'
+    name: 'compass-os-ocl-nofeature-ha-baremetal-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-onos-sfc-ha-baremetal-euphrates-trigger'
+    name: 'compass-os-onos-sfc-ha-baremetal-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-odl_l2-moon-ha-baremetal-euphrates-trigger'
+    name: 'compass-os-odl_l2-moon-ha-baremetal-fraser-trigger'
     triggers:
-      - timed: '0 5 1-29/2 * *'
+      - timed: ''  # '0 5 1-29/2 * *'
 - trigger:
-    name: 'compass-os-nosdn-kvm-ha-baremetal-euphrates-trigger'
+    name: 'compass-os-nosdn-kvm-ha-baremetal-fraser-trigger'
     triggers:
       - timed: '0 13 2-30/2 * *'
 - trigger:
-    name: 'compass-os-nosdn-ovs_dpdk-ha-baremetal-euphrates-trigger'
+    name: 'compass-os-nosdn-ovs_dpdk-ha-baremetal-fraser-trigger'
     triggers:
       - timed: '0 9 1-29/2 * *'
 - trigger:
-    name: 'compass-k8-nosdn-nofeature-ha-baremetal-euphrates-trigger'
+    name: 'compass-k8-nosdn-nofeature-ha-baremetal-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-odl-sfc-ha-baremetal-euphrates-trigger'
+    name: 'compass-os-odl-sfc-ha-baremetal-fraser-trigger'
     triggers:
       - timed: '0 17 2-30/2 * *'
 - trigger:
-    name: 'compass-os-nosdn-bar-ha-baremetal-euphrates-trigger'
+    name: 'compass-os-nosdn-bar-ha-baremetal-fraser-trigger'
     triggers:
       - timed: '0 21 1-29/2 * *'
 - trigger:
-    name: 'compass-k8-nosdn-stor4nfv-ha-baremetal-euphrates-trigger'
+    name: 'compass-k8-nosdn-stor4nfv-ha-baremetal-fraser-trigger'
     triggers:
       - timed: ''
 
 # ---------------------
-# noha-baremetal-euphrates
+# noha-baremetal-fraser
 # ---------------------
 - trigger:
-    name: 'compass-os-nosdn-kvm-noha-baremetal-euphrates-trigger'
+    name: 'compass-os-nosdn-kvm-noha-baremetal-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-nosdn-nofeature-noha-baremetal-euphrates-trigger'
+    name: 'compass-os-nosdn-nofeature-noha-baremetal-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-odl_l3-nofeature-noha-baremetal-euphrates-trigger'
+    name: 'compass-os-odl_l3-nofeature-noha-baremetal-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-odl_l2-moon-noha-baremetal-euphrates-trigger'
+    name: 'compass-os-odl_l2-moon-noha-baremetal-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-odl-sfc-noha-baremetal-euphrates-trigger'
+    name: 'compass-os-odl-sfc-noha-baremetal-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-euphrates-trigger'
+    name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-nosdn-bar-noha-baremetal-euphrates-trigger'
+    name: 'compass-os-nosdn-bar-noha-baremetal-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-k8-nosdn-stor4nfv-noha-baremetal-euphrates-trigger'
+    name: 'compass-k8-nosdn-stor4nfv-noha-baremetal-fraser-trigger'
     triggers:
       - timed: ''
 
@@ -871,10 +852,6 @@
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-virtual-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
     name: 'compass-os-odl_l3-nofeature-ha-virtual-master-trigger'
     triggers:
       - timed: '0 19 2-30/2 * *'
@@ -893,7 +870,7 @@
 - trigger:
     name: 'compass-os-odl_l2-moon-ha-virtual-master-trigger'
     triggers:
-      - timed: '30 12 1-29/2 * *'
+      - timed: ''  # '30 12 1-29/2 * *'
 - trigger:
     name: 'compass-os-nosdn-kvm-ha-virtual-master-trigger'
     triggers:
@@ -937,7 +914,7 @@
 - trigger:
     name: 'compass-os-odl_l2-moon-noha-virtual-master-trigger'
     triggers:
-      - timed: '0 18 2-30/2 * *'
+      - timed: ''  # '0 18 2-30/2 * *'
 - trigger:
     name: 'compass-os-odl-sfc-noha-virtual-master-trigger'
     triggers:
@@ -956,97 +933,93 @@
       - timed: '0 10 2-30/2 * *'
 
 # -----------------
-# ha-virtual-euphrates
+# ha-virtual-fraser
 # -----------------
 - trigger:
-    name: 'compass-os-nosdn-nofeature-ha-virtual-euphrates-trigger'
+    name: 'compass-os-nosdn-nofeature-ha-virtual-fraser-trigger'
     triggers:
       - timed: '0 23 1-29/2 * *'
 - trigger:
-    name: 'compass-os-nosdn-openo-ha-virtual-euphrates-trigger'
+    name: 'compass-os-nosdn-openo-ha-virtual-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-virtual-euphrates-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'compass-os-odl_l3-nofeature-ha-virtual-euphrates-trigger'
+    name: 'compass-os-odl_l3-nofeature-ha-virtual-fraser-trigger'
     triggers:
       - timed: '0 22 2-30/2 * *'
 - trigger:
-    name: 'compass-os-onos-nofeature-ha-virtual-euphrates-trigger'
+    name: 'compass-os-onos-nofeature-ha-virtual-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-ocl-nofeature-ha-virtual-euphrates-trigger'
+    name: 'compass-os-ocl-nofeature-ha-virtual-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-onos-sfc-ha-virtual-euphrates-trigger'
+    name: 'compass-os-onos-sfc-ha-virtual-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-odl_l2-moon-ha-virtual-euphrates-trigger'
+    name: 'compass-os-odl_l2-moon-ha-virtual-fraser-trigger'
     triggers:
       - timed: '0 20 1-29/2 * *'
 - trigger:
-    name: 'compass-os-nosdn-kvm-ha-virtual-euphrates-trigger'
+    name: 'compass-os-nosdn-kvm-ha-virtual-fraser-trigger'
     triggers:
       - timed: '0 16 2-30/2 * *'
 - trigger:
-    name: 'compass-os-nosdn-ovs_dpdk-ha-virtual-euphrates-trigger'
+    name: 'compass-os-nosdn-ovs_dpdk-ha-virtual-fraser-trigger'
     triggers:
       - timed: '0 14 1-29/2 * *'
 - trigger:
-    name: 'compass-os-odl-sfc-ha-virtual-euphrates-trigger'
+    name: 'compass-os-odl-sfc-ha-virtual-fraser-trigger'
     triggers:
       - timed: '0 18 2-30/2 * *'
 - trigger:
-    name: 'compass-k8-nosdn-nofeature-ha-virtual-euphrates-trigger'
+    name: 'compass-k8-nosdn-nofeature-ha-virtual-fraser-trigger'
     triggers:
       - timed: '5 1 2-30/2 * *'
 - trigger:
-    name: 'compass-os-nosdn-bar-ha-virtual-euphrates-trigger'
+    name: 'compass-os-nosdn-bar-ha-virtual-fraser-trigger'
     triggers:
       - timed: '0 19 1-29/2 * *'
 - trigger:
-    name: 'compass-k8-nosdn-stor4nfv-ha-virtual-euphrates-trigger'
+    name: 'compass-k8-nosdn-stor4nfv-ha-virtual-fraser-trigger'
     triggers:
-      - timed: ''  # '0 14 1-29/2 * *'
+      - timed: '0 15 1-29/2 * *'
 
 # -------------------
-# noha-virtual-euphrates
+# noha-virtual-fraser
 # -------------------
 - trigger:
-    name: 'compass-os-nosdn-kvm-noha-virtual-euphrates-trigger'
+    name: 'compass-os-nosdn-kvm-noha-virtual-fraser-trigger'
     triggers:
       - timed: '0 15 1-29/2 * *'
 - trigger:
-    name: 'compass-os-nosdn-nofeature-noha-virtual-euphrates-trigger'
+    name: 'compass-os-nosdn-nofeature-noha-virtual-fraser-trigger'
     triggers:
       - timed: '0 17 2-30/2 * *'
 - trigger:
-    name: 'compass-os-odl_l3-nofeature-noha-virtual-euphrates-trigger'
+    name: 'compass-os-odl_l3-nofeature-noha-virtual-fraser-trigger'
     triggers:
       - timed: '0 23 1-29/2 * *'
 - trigger:
-    name: 'compass-os-odl_l2-moon-noha-virtual-euphrates-trigger'
+    name: 'compass-os-odl_l2-moon-noha-virtual-fraser-trigger'
     triggers:
       - timed: '0 21 2-30/2 * *'
 - trigger:
-    name: 'compass-os-odl-sfc-noha-virtual-euphrates-trigger'
+    name: 'compass-os-odl-sfc-noha-virtual-fraser-trigger'
     triggers:
       - timed: '0 19 1-29/2 * *'
 - trigger:
-    name: 'compass-os-nosdn-ovs_dpdk-noha-virtual-euphrates-trigger'
+    name: 'compass-os-nosdn-ovs_dpdk-noha-virtual-fraser-trigger'
     triggers:
       - timed: '0 12 2-30/2 * *'
 - trigger:
-    name: 'compass-os-nosdn-bar-noha-virtual-euphrates-trigger'
+    name: 'compass-os-nosdn-bar-noha-virtual-fraser-trigger'
     triggers:
       - timed: '0 12 1-29/2 * *'
 - trigger:
-    name: 'compass-k8-nosdn-stor4nfv-noha-virtual-euphrates-trigger'
+    name: 'compass-k8-nosdn-stor4nfv-noha-virtual-fraser-trigger'
     triggers:
-      - timed: ''  # '0 12 2-30/2 * *'
+      - timed: '0 13 2-30/2 * *'