X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcompass4nfv%2Fcompass-ci-jobs.yml;h=0d97fef75fdd1dd2db3d0fe3e15028d22044f1a1;hb=7f53c3597432a3c5954f78a54c3f224514a7e729;hp=d469e57363ea4924612eb27f9e56b2efe7b92829;hpb=4a13b366f41b56b0bbb28c7104b952213112adc4;p=releng.git

diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index d469e5736..0d97fef75 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -10,10 +10,10 @@
         stream: master
         branch: '{stream}'
         gs-pathname: ''
-    brahmaputra: &brahmaputra
-        stream: brahmaputra
-        branch: 'stable/{stream}'
-        gs-pathname: '/{stream}'
+#    colorado: &colorado
+#        stream: colorado
+#        branch: 'stable/{stream}'
+#        gs-pathname: '/{stream}'
 #--------------------------------
 # POD, INSTALLER, AND BRANCH MAPPING
 #--------------------------------
@@ -28,18 +28,18 @@
             slave-label: compass-virtual
             os-version: 'trusty'
             <<: *master
-        - baremetal:
-            slave-label: compass-baremetal
-            os-version: 'trusty'
-            <<: *brahmaputra
-        - virtual:
-            slave-label: compass-virtual
-            os-version: 'trusty'
-            <<: *brahmaputra
+#        - baremetal:
+#            slave-label: compass-baremetal
+#            os-version: 'trusty'
+#            <<: *colorado
+#        - virtual:
+#            slave-label: compass-virtual
+#            os-version: 'trusty'
+#            <<: *colorado
 #--------------------------------
 #        master
 #--------------------------------
-        - huawei-pod2:
+        - huawei-pod5:
             slave-label: '{pod}'
             os-version: 'centos7'
             <<: *master
@@ -63,7 +63,7 @@
         - 'os-onos-sfc-ha':
             disabled: false
             auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
-        - 'os-odl_l2-moon-noha':
+        - 'os-odl_l2-moon-ha':
             disabled: false
             auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
         - 'os-nosdn-kvm-ha':
@@ -91,7 +91,8 @@
             use-build-blocker: true
             blocking-jobs:
                 - 'compass-os-.*?-{pod}-daily-.*?'
-                - 'compass-verify-[^-]*'
+                - 'compass-os-.*?-baremetal-daily-.*?'
+                - 'compass-verify-[^-]*-[^-]*'
             block-level: 'NODE'
 
     wrappers:
@@ -146,6 +147,19 @@
                 build-step-failure-threshold: 'never'
                 failure-threshold: 'never'
                 unstable-threshold: 'FAILURE'
+        #dovetail only master by now, not sync with A/B/C branches
+        #here the stream means the SUT stream, dovetail stream is defined in its own job
+        - trigger-builds:
+            - project: 'dovetail-compass-{pod}-debug-{stream}'
+              current-parameters: false
+              predefined-parameters:
+                DEPLOY_SCENARIO={scenario}
+              block: true
+              same-node: true
+              block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
 
 - job-template:
     name: 'compass-deploy-{pod}-daily-{stream}'
@@ -225,75 +239,71 @@
             name: COMPASS_OPENSTACK_VERSION
             choices:
                 - 'mitaka'
+                - 'newton'
                 - 'liberty'
-        - choice:
-            name: COMPASS_OS_VERSION_OPTION
-            choices:
-                - ''
-                - 'xenial'
 
 ########################
 # trigger macros
 ########################
 - trigger:
-    name: 'compass-os-nosdn-nofeature-ha-huawei-pod2-master-trigger'
+    name: 'compass-os-nosdn-nofeature-ha-huawei-pod5-master-trigger'
     triggers:
-        - timed: '0 3 * * *'
+        - timed: '0 19 * * *'
 - trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-huawei-pod2-master-trigger'
+    name: 'compass-os-odl_l2-nofeature-ha-huawei-pod5-master-trigger'
     triggers:
-        - timed: '0 21 * * *'
+        - timed: '0 23 * * *'
 - trigger:
-    name: 'compass-os-odl_l3-nofeature-ha-huawei-pod2-master-trigger'
+    name: 'compass-os-odl_l3-nofeature-ha-huawei-pod5-master-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 15 * * *'
 - trigger:
-    name: 'compass-os-onos-nofeature-ha-huawei-pod2-master-trigger'
+    name: 'compass-os-onos-nofeature-ha-huawei-pod5-master-trigger'
     triggers:
-        - timed: '0 15 * * *'
+        - timed: '0 7 * * *'
 - trigger:
-    name: 'compass-os-ocl-nofeature-ha-huawei-pod2-master-trigger'
+    name: 'compass-os-ocl-nofeature-ha-huawei-pod5-master-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 11 * * *'
 - trigger:
-    name: 'compass-os-onos-sfc-ha-huawei-pod2-master-trigger'
+    name: 'compass-os-onos-sfc-ha-huawei-pod5-master-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 3 * * *'
 - trigger:
-    name: 'compass-os-odl_l2-moon-noha-huawei-pod2-master-trigger'
+    name: 'compass-os-odl_l2-moon-ha-huawei-pod5-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-nosdn-kvm-ha-huawei-pod2-master-trigger'
+    name: 'compass-os-nosdn-kvm-ha-huawei-pod5-master-trigger'
     triggers:
         - timed: ''
 
 - trigger:
     name: 'compass-os-nosdn-nofeature-ha-baremetal-master-trigger'
     triggers:
-        - timed: '0 3 * * *'
+        - timed: '0 2 * * *'
 - trigger:
     name: 'compass-os-odl_l2-nofeature-ha-baremetal-master-trigger'
     triggers:
-        - timed: '0 21 * * *'
+        - timed: '0 22 * * *'
 - trigger:
     name: 'compass-os-odl_l3-nofeature-ha-baremetal-master-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 18 * * *'
 - trigger:
     name: 'compass-os-onos-nofeature-ha-baremetal-master-trigger'
     triggers:
-        - timed: '0 15 * * *'
+        - timed: '0 14 * * *'
 - trigger:
     name: 'compass-os-ocl-nofeature-ha-baremetal-master-trigger'
     triggers:
-        - timed: '0 9 * * *'
+        - timed: '0 10 * * *'
 - trigger:
     name: 'compass-os-onos-sfc-ha-baremetal-master-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 6 * * *'
 - trigger:
-    name: 'compass-os-odl_l2-moon-noha-baremetal-master-trigger'
+    name: 'compass-os-odl_l2-moon-ha-baremetal-master-trigger'
     triggers:
         - timed: ''
 - trigger:
@@ -302,100 +312,100 @@
         - timed: ''
 
 - trigger:
-    name: 'compass-os-nosdn-nofeature-ha-baremetal-brahmaputra-trigger'
+    name: 'compass-os-nosdn-nofeature-ha-baremetal-colorado-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-baremetal-brahmaputra-trigger'
+    name: 'compass-os-odl_l2-nofeature-ha-baremetal-colorado-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-odl_l3-nofeature-ha-baremetal-brahmaputra-trigger'
+    name: 'compass-os-odl_l3-nofeature-ha-baremetal-colorado-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-onos-nofeature-ha-baremetal-brahmaputra-trigger'
+    name: 'compass-os-onos-nofeature-ha-baremetal-colorado-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-ocl-nofeature-ha-baremetal-brahmaputra-trigger'
+    name: 'compass-os-ocl-nofeature-ha-baremetal-colorado-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-onos-sfc-ha-baremetal-brahmaputra-trigger'
+    name: 'compass-os-onos-sfc-ha-baremetal-colorado-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-odl_l2-moon-noha-baremetal-brahmaputra-trigger'
+    name: 'compass-os-odl_l2-moon-ha-baremetal-colorado-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-nosdn-kvm-ha-baremetal-brahmaputra-trigger'
+    name: 'compass-os-nosdn-kvm-ha-baremetal-colorado-trigger'
     triggers:
         - timed: ''
 
 - trigger:
     name: 'compass-os-nosdn-nofeature-ha-virtual-master-trigger'
     triggers:
-        - timed: '0 3 * * *'
+        - timed: '0 21 * * *'
 - trigger:
     name: 'compass-os-odl_l2-nofeature-ha-virtual-master-trigger'
     triggers:
-        - timed: '0 21 * * *'
+        - timed: '0 20 * * *'
 - trigger:
     name: 'compass-os-odl_l3-nofeature-ha-virtual-master-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 19 * * *'
 - trigger:
     name: 'compass-os-onos-nofeature-ha-virtual-master-trigger'
     triggers:
-        - timed: '0 15 * * *'
+        - timed: '0 18 * * *'
 - trigger:
     name: 'compass-os-ocl-nofeature-ha-virtual-master-trigger'
     triggers:
-        - timed: '0 9 * * *'
+        - timed: '0 16 * * *'
 - trigger:
     name: 'compass-os-onos-sfc-ha-virtual-master-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 15 * * *'
 - trigger:
-    name: 'compass-os-odl_l2-moon-noha-virtual-master-trigger'
+    name: 'compass-os-odl_l2-moon-ha-virtual-master-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 14 * * *'
 - trigger:
     name: 'compass-os-nosdn-kvm-ha-virtual-master-trigger'
     triggers:
         - timed: ''
 
 - trigger:
-    name: 'compass-os-nosdn-nofeature-ha-virtual-brahmaputra-trigger'
+    name: 'compass-os-nosdn-nofeature-ha-virtual-colorado-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 21 * * *'
 - trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-virtual-brahmaputra-trigger'
+    name: 'compass-os-odl_l2-nofeature-ha-virtual-colorado-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 20 * * *'
 - trigger:
-    name: 'compass-os-odl_l3-nofeature-ha-virtual-brahmaputra-trigger'
+    name: 'compass-os-odl_l3-nofeature-ha-virtual-colorado-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 19 * * *'
 - trigger:
-    name: 'compass-os-onos-nofeature-ha-virtual-brahmaputra-trigger'
+    name: 'compass-os-onos-nofeature-ha-virtual-colorado-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 18 * * *'
 - trigger:
-    name: 'compass-os-ocl-nofeature-ha-virtual-brahmaputra-trigger'
+    name: 'compass-os-ocl-nofeature-ha-virtual-colorado-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-onos-sfc-ha-virtual-brahmaputra-trigger'
+    name: 'compass-os-onos-sfc-ha-virtual-colorado-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 15 * * *'
 - trigger:
-    name: 'compass-os-odl_l2-moon-noha-virtual-brahmaputra-trigger'
+    name: 'compass-os-odl_l2-moon-ha-virtual-colorado-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 14 * * *'
 - trigger:
-    name: 'compass-os-nosdn-kvm-ha-virtual-brahmaputra-trigger'
+    name: 'compass-os-nosdn-kvm-ha-virtual-colorado-trigger'
     triggers:
         - timed: ''