X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcompass4nfv%2Fcompass-ci-jobs.yml;h=7b810087cf1eacc45c361d58914813e1c0d905bd;hb=bb14ee3615accbc8a7f17aeab619956f9fd3bf4e;hp=297e4f95b974975fcd1dc6d327981b57f272e841;hpb=1154bfe429dd308b502a107000d34800940005e3;p=releng.git

diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 297e4f95b..7b810087c 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -10,43 +10,65 @@
         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
 #--------------------------------
-    pod:
-#--------------------------------
-#        brahmaputra
+#        CI PODs
 #--------------------------------
-        - huawei-us-deploy-bare-1:
-            <<: *brahmaputra
-        - huawei-virtual:
-            <<: *brahmaputra
+    pod:
+        - baremetal:
+            slave-label: compass-baremetal
+            os-version: 'xenial'
+            <<: *master
+        - virtual:
+            slave-label: compass-virtual
+            os-version: 'xenial'
+            <<: *master
+#        - baremetal:
+#            slave-label: compass-baremetal
+#            os-version: 'trusty'
+#            <<: *colorado
+#        - virtual:
+#            slave-label: compass-virtual
+#            os-version: 'trusty'
+#            <<: *colorado
 #--------------------------------
 #        master
 #--------------------------------
-        - intel-pod8:
-            <<: *master
-        - huawei-virtual:
+        - huawei-pod5:
+            slave-label: '{pod}'
+            os-version: 'centos7'
             <<: *master
 
     scenario:
         - 'os-nosdn-nofeature-ha':
             disabled: false
-            auto-trigger-name: 'compass-{scenario}-{pod}-trigger'
+            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
         - 'os-odl_l2-nofeature-ha':
             disabled: false
-            auto-trigger-name: 'compass-{scenario}-{pod}-trigger'
+            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+        - 'os-odl_l3-nofeature-ha':
+            disabled: false
+            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
         - 'os-onos-nofeature-ha':
             disabled: false
-            auto-trigger-name: 'compass-{scenario}-{pod}-trigger'
+            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
         - 'os-ocl-nofeature-ha':
             disabled: false
-            auto-trigger-name: 'compass-{scenario}-{pod}-trigger'
+            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+        - 'os-onos-sfc-ha':
+            disabled: false
+            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+        - 'os-odl_l2-moon-ha':
+            disabled: false
+            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+        - 'os-nosdn-kvm-ha':
+            disabled: false
+            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
 
     jobs:
         - 'compass-{scenario}-{pod}-daily-{stream}'
@@ -64,11 +86,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:
@@ -84,18 +108,21 @@
         - 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
-              predefined-parameters:
+              current-parameters: true
+              predefined-parameters: |
                 DEPLOY_SCENARIO={scenario}
+                COMPASS_OS_VERSION={os-version}
               same-node: true
               block: true
         - trigger-builds:
@@ -120,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}'
@@ -132,6 +172,7 @@
         - throttle:
             enabled: true
             max-per-node: 1
+            option: 'project'
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
@@ -152,14 +193,11 @@
         - compass-ci-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
-        - '{pod}-defaults'
+        - '{slave-label}-defaults'
         - '{installer}-defaults'
 
     scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
+        - git-scm
 
     wrappers:
         - build-name:
@@ -167,6 +205,8 @@
 
 
     builders:
+        - description-setter:
+            description: "POD: $NODE_NAME"
         - shell:
             !include-raw-escape: ./compass-download-artifact.sh
         - shell:
@@ -195,62 +235,172 @@
         - choice:
             name: COMPASS_OPENSTACK_VERSION
             choices:
-                - 'liberty'
-                - 'juno'
-        - choice:
-            name: COMPASS_OS_VERSION
-            choices:
-                - 'trusty'
-                - 'centos7'
+                - 'newton'
 
 ########################
 # trigger macros
 ########################
 - trigger:
-    name: 'compass-os-nosdn-nofeature-ha-huawei-us-deploy-bare-1-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-us-deploy-bare-1-trigger'
+    name: 'compass-os-odl_l2-nofeature-ha-huawei-pod5-master-trigger'
     triggers:
-        - timed: '0 21 * * *'
+        - timed: '0 23 * * *'
 - trigger:
-    name: 'compass-os-onos-nofeature-ha-huawei-us-deploy-bare-1-trigger'
+    name: 'compass-os-odl_l3-nofeature-ha-huawei-pod5-master-trigger'
     triggers:
         - timed: '0 15 * * *'
 - trigger:
-    name: 'compass-os-ocl-nofeature-ha-huawei-us-deploy-bare-1-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 9 * * *'
+        - timed: '0 11 * * *'
 - trigger:
-    name: 'compass-os-nosdn-nofeature-ha-intel-pod8-trigger'
+    name: 'compass-os-onos-sfc-ha-huawei-pod5-master-trigger'
     triggers:
         - timed: '0 3 * * *'
 - trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-intel-pod8-trigger'
+    name: 'compass-os-odl_l2-moon-ha-huawei-pod5-master-trigger'
+    triggers:
+        - timed: ''
+- 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 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-nosdn-kvm-ha-baremetal-master-trigger'
+    triggers:
+        - timed: ''
+
+- trigger:
+    name: 'compass-os-nosdn-nofeature-ha-baremetal-colorado-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-odl_l2-nofeature-ha-baremetal-colorado-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-odl_l3-nofeature-ha-baremetal-colorado-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-onos-nofeature-ha-baremetal-colorado-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-ocl-nofeature-ha-baremetal-colorado-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-onos-sfc-ha-baremetal-colorado-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-odl_l2-moon-ha-baremetal-colorado-trigger'
+    triggers:
+        - timed: ''
+- 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-onos-nofeature-ha-intel-pod8-trigger'
+    name: 'compass-os-odl_l2-nofeature-ha-virtual-master-trigger'
+    triggers:
+        - timed: '0 20 * * *'
+- 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-onos-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-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 14 * * *'
+- trigger:
+    name: 'compass-os-nosdn-kvm-ha-virtual-colorado-trigger'
     triggers:
-        - timed: '0 9 * * *'
+        - timed: ''