X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcompass4nfv%2Fcompass-ci-jobs.yml;h=74a134eda83aa38df69b5c82173106f2ca06488e;hb=b72cc283dec30ffb0e632db7f3243636056bc0af;hp=310347de26cd4bf15a279906881ec0d0ec2213ed;hpb=e79e592fb9559f2a513bb86112acad3746148aac;p=releng.git

diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 310347de2..74a134eda 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -13,6 +13,13 @@
         ppa-pathname: '/{stream}'
         disabled: false
         openstack-version: ocata
+    euphrates: &euphrates
+        stream: euphrates
+        branch: 'stable/{stream}'
+        disabled: false
+        gs-pathname: '/{stream}'
+        ppa-pathname: '/{stream}'
+        openstack-version: ocata
     danube: &danube
         stream: danube
         branch: 'stable/{stream}'
@@ -37,11 +44,11 @@
         - baremetal:
             slave-label: compass-baremetal-branch
             os-version: 'xenial'
-            <<: *danube
+            <<: *euphrates
         - virtual:
             slave-label: compass-virtual-branch
             os-version: 'xenial'
-            <<: *danube
+            <<: *euphrates
 #--------------------------------
 #        master
 #--------------------------------
@@ -49,6 +56,13 @@
             slave-label: 'intel-pod8'
             os-version: 'centos7'
             <<: *master
+#--------------------------------
+#       danube for dovetail
+#--------------------------------
+        - huawei-pod7:
+            slave-label: 'huawei-pod7'
+            os-version: 'xenial'
+            <<: *danube
 
     scenario:
         - 'os-nosdn-nofeature-ha':
@@ -87,6 +101,24 @@
         - 'k8-nosdn-nofeature-ha':
             disabled: false
             auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+        - 'os-nosdn-nofeature-noha':
+            disabled: false
+            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+        - 'os-odl_l3-nofeature-noha':
+            disabled: false
+            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+        - 'os-odl_l2-moon-noha':
+            disabled: false
+            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+        - 'os-nosdn-kvm-noha':
+            disabled: false
+            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+        - 'os-odl-sfc-noha':
+            disabled: false
+            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+        - 'os-nosdn-dpdk-noha':
+            disabled: false
+            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
 
 
     jobs:
@@ -177,7 +209,8 @@
         # here the stream means the SUT stream, dovetail stream is defined in its own job
         # only run on os-(nosdn|odl_l2|onos|odl_l3)-nofeature-ha scenario
         # run against SUT master branch, dovetail docker image with latest tag
-        # run against SUT danube branch, dovetail docker image with latest tag(odd days)and cvp.X.X.X tag(even days)
+        # run against SUT danube branch, dovetail docker image with latest tag(Monday and Sunday)
+        # run against SUT danube branch, dovetail docker image with cvp.X.X.X tag(Tuesday, Thursday, Friday and Saturday)
         - conditional-step:
             condition-kind: and
             condition-operands:
@@ -185,14 +218,12 @@
                   regex: danube
                   label: '{stream}'
                 - condition-kind: regex-match
-                  regex: os-(nosdn|odl_l2|onos|odl_l3)-nofeature-ha
+                  regex: os-(nosdn|odl_l2|odl_l3)-nofeature-ha
                   label: '{scenario}'
                 - condition-kind: day-of-week
                   day-selector: select-days
                   days:
                       MON: true
-                      WED: true
-                      FRI: true
                       SUN: true
                   use-build-time: true
             steps:
@@ -215,13 +246,15 @@
                   regex: danube
                   label: '{stream}'
                 - condition-kind: regex-match
-                  regex: os-(nosdn|odl_l2|onos|odl_l3)-nofeature-ha
+                  regex: os-(nosdn|odl_l2|odl_l3)-nofeature-ha
                   label: '{scenario}'
                 - condition-kind: day-of-week
                   day-selector: select-days
                   days:
                       TUES: true
+                      WED: true
                       THURS: true
+                      FRI: true
                       SAT: true
                   use-build-time: true
             steps:
@@ -240,7 +273,7 @@
             condition-kind: and
             condition-operands:
                 - condition-kind: regex-match
-                  regex: os-(nosdn|odl_l2|onos|odl_l3)-nofeature-ha
+                  regex: os-(nosdn|odl_l2|odl_l3)-nofeature-ha
                   label: '{scenario}'
                 - condition-kind: regex-match
                   regex: master
@@ -314,7 +347,7 @@
                     !include-raw-escape: ./compass-deploy.sh
         - conditional-step:
             condition-kind: regex-match
-            regex: danube
+            regex: (danube|euphrates)
             label: '{stream}'
             steps:
                 - shell:
@@ -322,7 +355,6 @@
                 - shell:
                     !include-raw-escape: ./compass-deploy.sh
 
-
 ########################
 # parameter macros
 ########################
@@ -351,6 +383,10 @@
 ########################
 # trigger macros
 ########################
+
+#---------------------------
+# ha-baremetal-centos-master
+#---------------------------
 - trigger:
     name: 'compass-os-nosdn-nofeature-ha-baremetal-centos-master-trigger'
     triggers:
@@ -362,7 +398,7 @@
 - trigger:
     name: 'compass-os-odl_l2-nofeature-ha-baremetal-centos-master-trigger'
     triggers:
-        - timed: '0 23 * * *'
+        - timed: ''
 - trigger:
     name: 'compass-os-odl_l3-nofeature-ha-baremetal-centos-master-trigger'
     triggers:
@@ -400,10 +436,120 @@
     triggers:
         - timed: ''
 
+#-----------------------------
+# noha-baremetal-centos-master
+#-----------------------------
+- trigger:
+    name: 'compass-os-nosdn-nofeature-noha-baremetal-centos-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-odl_l3-nofeature-noha-baremetal-centos-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-odl_l2-moon-noha-baremetal-centos-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-nosdn-kvm-noha-baremetal-centos-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-odl-sfc-noha-baremetal-centos-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-nosdn-dpdk-noha-baremetal-centos-master-trigger'
+    triggers:
+        - timed: ''
+
+#---------------------------
+# ha-huawei-pod7-danube
+#---------------------------
+- trigger:
+    name: 'compass-os-nosdn-nofeature-ha-huawei-pod7-danube-trigger'
+    triggers:
+        - timed: '0 19 * * *'
+- trigger:
+    name: 'compass-os-nosdn-openo-ha-huawei-pod7-danube-trigger'
+    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 * * *'
+- trigger:
+    name: 'compass-os-onos-nofeature-ha-huawei-pod7-danube-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-ocl-nofeature-ha-huawei-pod7-danube-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-onos-sfc-ha-huawei-pod7-danube-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-odl_l2-moon-ha-huawei-pod7-danube-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-nosdn-kvm-ha-huawei-pod7-danube-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-nosdn-dpdk-ha-huawei-pod7-danube-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-odl-sfc-ha-huawei-pod7-danube-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-k8-nosdn-nofeature-ha-huawei-pod7-danube-trigger'
+    triggers:
+        - timed: ''
+
+#-----------------------------
+# noha-huawei-pod7-danube
+#-----------------------------
+- trigger:
+    name: 'compass-os-nosdn-nofeature-noha-huawei-pod7-danube-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-odl_l3-nofeature-noha-huawei-pod7-danube-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-odl_l2-moon-noha-huawei-pod7-danube-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-nosdn-kvm-noha-huawei-pod7-danube-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-odl-sfc-noha-huawei-pod7-danube-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-nosdn-dpdk-noha-huawei-pod7-danube-trigger'
+    triggers:
+        - timed: ''
+#--------------------
+# ha-baremetal-master
+#--------------------
 - trigger:
     name: 'compass-os-nosdn-nofeature-ha-baremetal-master-trigger'
     triggers:
-        - timed: '0 2 * * *'
+        - timed: '0 20 * * *'
 - trigger:
     name: 'compass-os-nosdn-openo-ha-baremetal-master-trigger'
     triggers:
@@ -411,7 +557,7 @@
 - trigger:
     name: 'compass-os-odl_l2-nofeature-ha-baremetal-master-trigger'
     triggers:
-        - timed: '0 22 * * *'
+        - timed: ''
 - trigger:
     name: 'compass-os-odl_l3-nofeature-ha-baremetal-master-trigger'
     triggers:
@@ -431,7 +577,7 @@
 - trigger:
     name: 'compass-os-odl_l2-moon-ha-baremetal-master-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 12 * * *'
 - trigger:
     name: 'compass-os-nosdn-kvm-ha-baremetal-master-trigger'
     triggers:
@@ -443,63 +589,123 @@
 - trigger:
     name: 'compass-k8-nosdn-nofeature-ha-baremetal-master-trigger'
     triggers:
-        - timed: '0 20 * * *'
+        - timed: ''
 - trigger:
     name: 'compass-os-odl-sfc-ha-baremetal-master-trigger'
     triggers:
-        - timed: '0 4 * * *'
+        - timed: '0 10 * * *'
 
+#----------------------
+# noha-baremetal-master
+#----------------------
+- trigger:
+    name: 'compass-os-nosdn-kvm-noha-baremetal-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-nosdn-nofeature-noha-baremetal-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-odl_l3-nofeature-noha-baremetal-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-odl_l2-moon-noha-baremetal-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-odl-sfc-noha-baremetal-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-nosdn-dpdk-noha-baremetal-master-trigger'
+    triggers:
+        - timed: ''
 
+#--------------------
+# ha-baremetal-euphrates
+#--------------------
 - trigger:
-    name: 'compass-os-nosdn-nofeature-ha-baremetal-danube-trigger'
+    name: 'compass-os-nosdn-nofeature-ha-baremetal-euphrates-trigger'
     triggers:
-        - timed: '0 9 * * *'
+        - timed: '0 1 * * *'
 - trigger:
-    name: 'compass-os-nosdn-openo-ha-baremetal-danube-trigger'
+    name: 'compass-os-nosdn-openo-ha-baremetal-euphrates-trigger'
     triggers:
-        - timed: '0 13 * * *'
+        - timed: ''
 - trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-baremetal-danube-trigger'
+    name: 'compass-os-odl_l2-nofeature-ha-baremetal-euphrates-trigger'
     triggers:
-        - timed: '0 17 * * *'
+        - timed: ''
 - trigger:
-    name: 'compass-os-odl_l3-nofeature-ha-baremetal-danube-trigger'
+    name: 'compass-os-odl_l3-nofeature-ha-baremetal-euphrates-trigger'
     triggers:
         - timed: '0 21 * * *'
 - trigger:
-    name: 'compass-os-onos-nofeature-ha-baremetal-danube-trigger'
+    name: 'compass-os-onos-nofeature-ha-baremetal-euphrates-trigger'
     triggers:
-        - timed: '0 1 * * *'
+        - timed: ''
+- trigger:
+    name: 'compass-os-ocl-nofeature-ha-baremetal-euphrates-trigger'
+    triggers:
+        - timed: ''
 - trigger:
-    name: 'compass-os-ocl-nofeature-ha-baremetal-danube-trigger'
+    name: 'compass-os-onos-sfc-ha-baremetal-euphrates-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-onos-sfc-ha-baremetal-danube-trigger'
+    name: 'compass-os-odl_l2-moon-ha-baremetal-euphrates-trigger'
     triggers:
         - timed: '0 5 * * *'
 - trigger:
-    name: 'compass-os-odl_l2-moon-ha-baremetal-danube-trigger'
+    name: 'compass-os-nosdn-kvm-ha-baremetal-euphrates-trigger'
+    triggers:
+        - timed: '0 13 * * *'
+- trigger:
+    name: 'compass-os-nosdn-dpdk-ha-baremetal-euphrates-trigger'
+    triggers:
+        - timed: '0 9 * * *'
+- trigger:
+    name: 'compass-k8-nosdn-nofeature-ha-baremetal-euphrates-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-nosdn-kvm-ha-baremetal-danube-trigger'
+    name: 'compass-os-odl-sfc-ha-baremetal-euphrates-trigger'
+    triggers:
+        - timed: '0 17 * * *'
+
+#----------------------
+# noha-baremetal-euphrates
+#----------------------
+- trigger:
+    name: 'compass-os-nosdn-kvm-noha-baremetal-euphrates-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-nosdn-dpdk-ha-baremetal-danube-trigger'
+    name: 'compass-os-nosdn-nofeature-noha-baremetal-euphrates-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-k8-nosdn-nofeature-ha-baremetal-danube-trigger'
+    name: 'compass-os-odl_l3-nofeature-noha-baremetal-euphrates-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-odl-sfc-ha-baremetal-danube-trigger'
+    name: 'compass-os-odl_l2-moon-noha-baremetal-euphrates-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-odl-sfc-noha-baremetal-euphrates-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-nosdn-dpdk-noha-baremetal-euphrates-trigger'
     triggers:
         - timed: ''
 
-
+#------------------
+# ha-virtual-master
+#------------------
 - trigger:
     name: 'compass-os-nosdn-nofeature-ha-virtual-master-trigger'
     triggers:
@@ -511,7 +717,7 @@
 - trigger:
     name: 'compass-os-odl_l2-nofeature-ha-virtual-master-trigger'
     triggers:
-        - timed: '0 20 * * *'
+        - timed: ''
 - trigger:
     name: 'compass-os-odl_l3-nofeature-ha-virtual-master-trigger'
     triggers:
@@ -531,11 +737,11 @@
 - trigger:
     name: 'compass-os-odl_l2-moon-ha-virtual-master-trigger'
     triggers:
-        - timed: ''
+        - timed: '30 12 * * *'
 - trigger:
     name: 'compass-os-nosdn-kvm-ha-virtual-master-trigger'
     triggers:
-        - timed: '0 23 * * *'
+        - timed: '0 13 * * *'
 - trigger:
     name: 'compass-os-nosdn-dpdk-ha-virtual-master-trigger'
     triggers:
@@ -543,57 +749,116 @@
 - trigger:
     name: 'compass-k8-nosdn-nofeature-ha-virtual-master-trigger'
     triggers:
-        - timed: '0 18 * * *'
+        - timed: '0 12 * * *'
 - trigger:
     name: 'compass-os-odl-sfc-ha-virtual-master-trigger'
     triggers:
         - timed: '0 16 * * *'
 
+#--------------------
+# noha-virtual-master
+#--------------------
 - trigger:
-    name: 'compass-os-nosdn-nofeature-ha-virtual-danube-trigger'
+    name: 'compass-os-nosdn-kvm-noha-virtual-master-trigger'
     triggers:
-        - timed: '0 21 * * *'
+        - timed: '30 13 * * *'
 - trigger:
-    name: 'compass-os-nosdn-openo-ha-virtual-danube-trigger'
+    name: 'compass-os-nosdn-nofeature-noha-virtual-master-trigger'
     triggers:
-        - timed: '0 22 * * *'
+        - timed: '0 14 * * *'
 - trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-virtual-danube-trigger'
+    name: 'compass-os-odl_l3-nofeature-noha-virtual-master-trigger'
+    triggers:
+        - timed: '0 15 * * *'
+- trigger:
+    name: 'compass-os-odl_l2-moon-noha-virtual-master-trigger'
+    triggers:
+        - timed: '0 18 * * *'
+- trigger:
+    name: 'compass-os-odl-sfc-noha-virtual-master-trigger'
     triggers:
         - timed: '0 20 * * *'
 - trigger:
-    name: 'compass-os-odl_l3-nofeature-ha-virtual-danube-trigger'
+    name: 'compass-os-nosdn-dpdk-noha-virtual-master-trigger'
     triggers:
-        - timed: '0 19 * * *'
+        - timed: '0 11 * * *'
+
+#------------------
+# ha-virtual-euphrates
+#------------------
 - trigger:
-    name: 'compass-os-onos-nofeature-ha-virtual-danube-trigger'
+    name: 'compass-os-nosdn-nofeature-ha-virtual-euphrates-trigger'
     triggers:
-        - timed: '0 18 * * *'
+        - timed: '0 23 * * *'
 - trigger:
-    name: 'compass-os-ocl-nofeature-ha-virtual-danube-trigger'
+    name: 'compass-os-nosdn-openo-ha-virtual-euphrates-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-onos-sfc-ha-virtual-danube-trigger'
+    name: 'compass-os-odl_l2-nofeature-ha-virtual-euphrates-trigger'
     triggers:
-        - timed: '0 15 * * *'
+        - timed: ''
 - trigger:
-    name: 'compass-os-odl_l2-moon-ha-virtual-danube-trigger'
+    name: 'compass-os-odl_l3-nofeature-ha-virtual-euphrates-trigger'
     triggers:
-        - timed: '0 14 * * *'
+        - timed: '0 22 * * *'
 - trigger:
-    name: 'compass-os-nosdn-kvm-ha-virtual-danube-trigger'
+    name: 'compass-os-onos-nofeature-ha-virtual-euphrates-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-nosdn-dpdk-ha-virtual-danube-trigger'
+    name: 'compass-os-ocl-nofeature-ha-virtual-euphrates-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-odl-sfc-ha-virtual-danube-trigger'
+    name: 'compass-os-onos-sfc-ha-virtual-euphrates-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-k8-nosdn-nofeature-ha-virtual-danube-trigger'
+    name: 'compass-os-odl_l2-moon-ha-virtual-euphrates-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 20 * * *'
+- trigger:
+    name: 'compass-os-nosdn-kvm-ha-virtual-euphrates-trigger'
+    triggers:
+        - timed: '0 16 * * *'
+- trigger:
+    name: 'compass-os-nosdn-dpdk-ha-virtual-euphrates-trigger'
+    triggers:
+        - timed: '0 14 * * *'
+- trigger:
+    name: 'compass-os-odl-sfc-ha-virtual-euphrates-trigger'
+    triggers:
+        - timed: '0 18 * * *'
+- trigger:
+    name: 'compass-k8-nosdn-nofeature-ha-virtual-euphrates-trigger'
+    triggers:
+        - timed: '0 13 * * *'
+
+#--------------------
+# noha-virtual-euphrates
+#--------------------
+- trigger:
+    name: 'compass-os-nosdn-kvm-noha-virtual-euphrates-trigger'
+    triggers:
+        - timed: '0 15 * * *'
+- trigger:
+    name: 'compass-os-nosdn-nofeature-noha-virtual-euphrates-trigger'
+    triggers:
+        - timed: '0 17 * * *'
+- trigger:
+    name: 'compass-os-odl_l3-nofeature-noha-virtual-euphrates-trigger'
+    triggers:
+        - timed: '0 23 * * *'
+- trigger:
+    name: 'compass-os-odl_l2-moon-noha-virtual-euphrates-trigger'
+    triggers:
+        - timed: '0 21 * * *'
+- trigger:
+    name: 'compass-os-odl-sfc-noha-virtual-euphrates-trigger'
+    triggers:
+        - timed: '0 19 * * *'
+- trigger:
+    name: 'compass-os-nosdn-dpdk-noha-virtual-euphrates-trigger'
+    triggers:
+        - timed: '0 12 * * *'