X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcompass4nfv%2Fcompass-ci-jobs.yml;h=b70bfc67b8310b78de6219facbeb62896a956a18;hb=c352caa1429c849f53bf2e8a480d64c9657b4c20;hp=40f17b889ca98ca4a776c11dd339eb0635375ce1;hpb=b2feb8edf2b28a0c174d022e69e825e00f66e701;p=releng.git

diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 40f17b889..b70bfc67b 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -10,53 +10,73 @@
         stream: master
         branch: '{stream}'
         gs-pathname: ''
-    brahmaputra: &brahmaputra
-        stream: brahmaputra
+    colorado: &colorado
+        stream: colorado
         branch: 'stable/{stream}'
         gs-pathname: '/{stream}'
-
 #--------------------------------
 # POD, INSTALLER, AND BRANCH MAPPING
 #--------------------------------
-    pod:
-#--------------------------------
-#        brahmaputra
+#        CI PODs
 #--------------------------------
-        - huawei-us-deploy-bare-1:
+    pod:
+        - baremetal:
+            slave-label: compass-baremetal
             os-version: 'trusty'
-            <<: *brahmaputra
-        - huawei-virtual:
+            <<: *master
+        - virtual:
+            slave-label: compass-virtual
             os-version: 'trusty'
-            <<: *brahmaputra
+            <<: *master
+        - baremetal:
+            slave-label: compass-baremetal
+            os-version: 'trusty'
+            <<: *colorado
+        - virtual:
+            slave-label: compass-virtual
+            os-version: 'trusty'
+            <<: *colorado
 #--------------------------------
 #        master
 #--------------------------------
-        - huawei-us-deploy-bare-2:
+        - huawei-pod5:
+            slave-label: '{pod}'
             os-version: 'centos7'
             <<: *master
-        - intel-pod8:
-            os-version: 'trusty'
-            <<: *master
-        - huawei-virtual:
-            os-version: 'trusty'
-            <<: *master
 
     scenario:
         - 'os-nosdn-nofeature-ha':
             disabled: false
-            auto-trigger-name: 'compass-{scenario}-{pod}-trigger'
+            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+            openstack-os-version: ''
         - 'os-odl_l2-nofeature-ha':
             disabled: false
-            auto-trigger-name: 'compass-{scenario}-{pod}-trigger'
+            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+            openstack-os-version: ''
         - 'os-odl_l3-nofeature-ha':
             disabled: false
-            auto-trigger-name: 'compass-{scenario}-{pod}-trigger'
+            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+            openstack-os-version: ''
         - 'os-onos-nofeature-ha':
             disabled: false
-            auto-trigger-name: 'compass-{scenario}-{pod}-trigger'
+            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+            openstack-os-version: ''
         - 'os-ocl-nofeature-ha':
             disabled: false
-            auto-trigger-name: 'compass-{scenario}-{pod}-trigger'
+            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+            openstack-os-version: ''
+        - 'os-onos-sfc-ha':
+            disabled: false
+            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+            openstack-os-version: ''
+        - 'os-odl_l2-moon-ha':
+            disabled: false
+            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+            openstack-os-version: 'xenial'
+        - 'os-nosdn-kvm-ha':
+            disabled: false
+            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+            openstack-os-version: ''
 
     jobs:
         - 'compass-{scenario}-{pod}-daily-{stream}'
@@ -74,11 +94,13 @@
         - throttle:
             enabled: true
             max-per-node: 1
+            option: 'project'
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
                 - 'compass-os-.*?-{pod}-daily-.*?'
-                - 'compass-verify-[^-]*'
+                - 'compass-os-.*?-baremetal-daily-.*?'
+                - 'compass-verify-[^-]*-[^-]*'
             block-level: 'NODE'
 
     wrappers:
@@ -94,19 +116,22 @@
         - string:
             name: DEPLOY_SCENARIO
             default: '{scenario}'
-        - '{pod}-defaults'
+        - '{slave-label}-defaults'
         - '{installer}-defaults'
 
     triggers:
         - '{auto-trigger-name}'
 
     builders:
+        - description-setter:
+            description: "POD: $NODE_NAME"
         - trigger-builds:
             - project: 'compass-deploy-{pod}-daily-{stream}'
-              current-parameters: false
+              current-parameters: true
               predefined-parameters: |
                 DEPLOY_SCENARIO={scenario}
                 COMPASS_OS_VERSION={os-version}
+                COMPASS_OS_VERSION_OPTION={openstack-os-version}
               same-node: true
               block: true
         - trigger-builds:
@@ -131,6 +156,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}-basic-{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}'
@@ -143,6 +181,7 @@
         - throttle:
             enabled: true
             max-per-node: 1
+            option: 'project'
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
@@ -163,7 +202,7 @@
         - compass-ci-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
-        - '{pod}-defaults'
+        - '{slave-label}-defaults'
         - '{installer}-defaults'
 
     scm:
@@ -178,6 +217,8 @@
 
 
     builders:
+        - description-setter:
+            description: "POD: $NODE_NAME"
         - shell:
             !include-raw-escape: ./compass-download-artifact.sh
         - shell:
@@ -206,89 +247,179 @@
         - choice:
             name: COMPASS_OPENSTACK_VERSION
             choices:
+                - 'mitaka'
+                - 'newton'
                 - 'liberty'
-                - 'juno'
+        - choice:
+            name: COMPASS_OS_VERSION_OPTION
+            choices:
+                - ''
+                - 'xenial'
 
 ########################
 # trigger macros
 ########################
 - trigger:
-    name: 'compass-os-nosdn-nofeature-ha-huawei-us-deploy-bare-2-trigger'
+    name: 'compass-os-nosdn-nofeature-ha-huawei-pod5-master-trigger'
+    triggers:
+        - timed: '0 19 * * *'
+- trigger:
+    name: 'compass-os-odl_l2-nofeature-ha-huawei-pod5-master-trigger'
+    triggers:
+        - timed: '0 23 * * *'
+- trigger:
+    name: 'compass-os-odl_l3-nofeature-ha-huawei-pod5-master-trigger'
+    triggers:
+        - timed: '0 15 * * *'
+- trigger:
+    name: 'compass-os-onos-nofeature-ha-huawei-pod5-master-trigger'
+    triggers:
+        - timed: '0 7 * * *'
+- trigger:
+    name: 'compass-os-ocl-nofeature-ha-huawei-pod5-master-trigger'
+    triggers:
+        - timed: '0 11 * * *'
+- trigger:
+    name: 'compass-os-onos-sfc-ha-huawei-pod5-master-trigger'
+    triggers:
+        - timed: '0 3 * * *'
+- trigger:
+    name: 'compass-os-odl_l2-moon-ha-huawei-pod5-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-huawei-us-deploy-bare-2-trigger'
+    name: 'compass-os-nosdn-kvm-ha-huawei-pod5-master-trigger'
     triggers:
         - timed: ''
+
 - trigger:
-    name: 'compass-os-odl_l3-nofeature-ha-huawei-us-deploy-bare-2-trigger'
+    name: 'compass-os-nosdn-nofeature-ha-baremetal-master-trigger'
+    triggers:
+        - timed: '0 2 * * *'
+- trigger:
+    name: 'compass-os-odl_l2-nofeature-ha-baremetal-master-trigger'
+    triggers:
+        - timed: '0 22 * * *'
+- trigger:
+    name: 'compass-os-odl_l3-nofeature-ha-baremetal-master-trigger'
+    triggers:
+        - timed: '0 18 * * *'
+- trigger:
+    name: 'compass-os-onos-nofeature-ha-baremetal-master-trigger'
+    triggers:
+        - timed: '0 14 * * *'
+- trigger:
+    name: 'compass-os-ocl-nofeature-ha-baremetal-master-trigger'
+    triggers:
+        - timed: '0 10 * * *'
+- trigger:
+    name: 'compass-os-onos-sfc-ha-baremetal-master-trigger'
+    triggers:
+        - timed: '0 6 * * *'
+- trigger:
+    name: 'compass-os-odl_l2-moon-ha-baremetal-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-onos-nofeature-ha-huawei-us-deploy-bare-2-trigger'
+    name: 'compass-os-nosdn-kvm-ha-baremetal-master-trigger'
     triggers:
         - timed: ''
+
 - trigger:
-    name: 'compass-os-ocl-nofeature-ha-huawei-us-deploy-bare-2-trigger'
+    name: 'compass-os-nosdn-nofeature-ha-baremetal-colorado-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-nosdn-nofeature-ha-huawei-us-deploy-bare-1-trigger'
+    name: 'compass-os-odl_l2-nofeature-ha-baremetal-colorado-trigger'
     triggers:
-        - timed: '0 3 * * * '
+        - timed: ''
 - trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-huawei-us-deploy-bare-1-trigger'
+    name: 'compass-os-odl_l3-nofeature-ha-baremetal-colorado-trigger'
     triggers:
-        - timed: '0 21 * * *'
+        - timed: ''
 - trigger:
-    name: 'compass-os-odl_l3-nofeature-ha-huawei-us-deploy-bare-1-trigger'
+    name: 'compass-os-onos-nofeature-ha-baremetal-colorado-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-onos-nofeature-ha-huawei-us-deploy-bare-1-trigger'
+    name: 'compass-os-ocl-nofeature-ha-baremetal-colorado-trigger'
     triggers:
-        - timed: '0 15 * * *'
+        - timed: ''
 - trigger:
-    name: 'compass-os-ocl-nofeature-ha-huawei-us-deploy-bare-1-trigger'
+    name: 'compass-os-onos-sfc-ha-baremetal-colorado-trigger'
     triggers:
-        - timed: '0 9 * * *'
+        - timed: ''
 - trigger:
-    name: 'compass-os-nosdn-nofeature-ha-intel-pod8-trigger'
+    name: 'compass-os-odl_l2-moon-ha-baremetal-colorado-trigger'
     triggers:
-        - timed: '0 3 * * *'
+        - timed: ''
 - trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-intel-pod8-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 21 * * *'
 - trigger:
-    name: 'compass-os-odl_l3-nofeature-ha-intel-pod8-trigger'
+    name: 'compass-os-odl_l2-nofeature-ha-virtual-master-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 20 * * *'
 - trigger:
-    name: 'compass-os-onos-nofeature-ha-intel-pod8-trigger'
+    name: 'compass-os-odl_l3-nofeature-ha-virtual-master-trigger'
+    triggers:
+        - timed: '0 19 * * *'
+- trigger:
+    name: 'compass-os-onos-nofeature-ha-virtual-master-trigger'
+    triggers:
+        - timed: '0 18 * * *'
+- trigger:
+    name: 'compass-os-ocl-nofeature-ha-virtual-master-trigger'
+    triggers:
+        - timed: '0 16 * * *'
+- trigger:
+    name: 'compass-os-onos-sfc-ha-virtual-master-trigger'
     triggers:
         - timed: '0 15 * * *'
 - trigger:
-    name: 'compass-os-ocl-nofeature-ha-intel-pod8-trigger'
+    name: 'compass-os-odl_l2-moon-ha-virtual-master-trigger'
     triggers:
-        - timed: '0 9 * * *'
+        - timed: '0 14 * * *'
 - trigger:
-    name: 'compass-os-nosdn-nofeature-ha-huawei-virtual-trigger'
+    name: 'compass-os-nosdn-kvm-ha-virtual-master-trigger'
     triggers:
-        - timed: '0 3 * * *'
+        - timed: ''
+
 - trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-huawei-virtual-trigger'
+    name: 'compass-os-nosdn-nofeature-ha-virtual-colorado-trigger'
     triggers:
         - timed: '0 21 * * *'
 - trigger:
-    name: 'compass-os-odl_l3-nofeature-ha-huawei-virtual-trigger'
+    name: 'compass-os-odl_l2-nofeature-ha-virtual-colorado-trigger'
+    triggers:
+        - timed: '0 20 * * *'
+- trigger:
+    name: 'compass-os-odl_l3-nofeature-ha-virtual-colorado-trigger'
+    triggers:
+        - timed: '0 19 * * *'
+- trigger:
+    name: 'compass-os-onos-nofeature-ha-virtual-colorado-trigger'
+    triggers:
+        - timed: '0 18 * * *'
+- trigger:
+    name: 'compass-os-ocl-nofeature-ha-virtual-colorado-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-onos-nofeature-ha-huawei-virtual-trigger'
+    name: 'compass-os-onos-sfc-ha-virtual-colorado-trigger'
     triggers:
         - timed: '0 15 * * *'
 - trigger:
-    name: 'compass-os-ocl-nofeature-ha-huawei-virtual-trigger'
+    name: 'compass-os-odl_l2-moon-ha-virtual-colorado-trigger'
     triggers:
-        - timed: '0 9 * * *'
+        - timed: '0 14 * * *'
+- trigger:
+    name: 'compass-os-nosdn-kvm-ha-virtual-colorado-trigger'
+    triggers:
+        - timed: ''