Code Review / releng.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
[compass] use new pod to run compass jobs
[releng.git] / jjb / compass4nfv / compass-ci-jobs.yml
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 7ce9268..16c6695 100644 (file)
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -10,8 +10,8 @@
         stream: master
         branch: '{stream}'
         gs-pathname: ''
-    brahmaputra: &brahmaputra
-        stream: brahmaputra
+    colorado: &colorado
+        stream: colorado
         branch: 'stable/{stream}'
         gs-pathname: '/{stream}'
 #--------------------------------
@@ -31,15 +31,19 @@
         - baremetal:
             slave-label: compass-baremetal
             os-version: 'trusty'
-            <<: *brahmaputra
+            <<: *colorado
         - virtual:
             slave-label: compass-virtual
             os-version: 'trusty'
-            <<: *brahmaputra
+            <<: *colorado
 #--------------------------------
 #        master
 #--------------------------------
         - huawei-pod2:
+            slave-label: '{pod}'
+            os-version: 'trusty'
+            <<: *colorado
+        - huawei-pod5:
             slave-label: '{pod}'
             os-version: 'centos7'
             <<: *master
@@ -48,18 +52,35 @@
         - 'os-nosdn-nofeature-ha':
             disabled: false
             auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+            openstack-os-version: ''
         - 'os-odl_l2-nofeature-ha':
             disabled: false
             auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+            openstack-os-version: ''
         - 'os-odl_l3-nofeature-ha':
             disabled: false
             auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+            openstack-os-version: ''
         - 'os-onos-nofeature-ha':
             disabled: false
             auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+            openstack-os-version: ''
         - 'os-ocl-nofeature-ha':
             disabled: false
             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}'
@@ -77,6 +98,7 @@
         - throttle:
             enabled: true
             max-per-node: 1
+            option: 'project'
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
@@ -104,12 +126,15 @@
         - '{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:
@@ -146,6 +171,7 @@
         - throttle:
             enabled: true
             max-per-node: 1
+            option: 'project'
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
@@ -181,6 +207,8 @@
 
 
     builders:
+        - description-setter:
+            description: "POD: $NODE_NAME"
         - shell:
             !include-raw-escape: ./compass-download-artifact.sh
         - shell:
@@ -209,112 +237,211 @@
         - choice:
             name: COMPASS_OPENSTACK_VERSION
             choices:
+                - 'mitaka'
                 - 'liberty'
-                - 'juno'
+        - 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 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-nofeature-ha-huawei-pod2-master-trigger'
+    name: 'compass-os-odl_l2-moon-ha-huawei-pod5-master-trigger'
     triggers:
-        - timed: '0 21 * * *'
+        - timed: ''
 - trigger:
-    name: 'compass-os-odl_l3-nofeature-ha-huawei-pod2-master-trigger'
+    name: 'compass-os-nosdn-kvm-ha-huawei-pod5-master-trigger'
     triggers:
         - timed: ''
+
+- trigger:
+    name: 'compass-os-nosdn-nofeature-ha-huawei-pod2-colorado-trigger'
+    triggers:
+        - timed: '0 19 * * *'
 - trigger:
-    name: 'compass-os-onos-nofeature-ha-huawei-pod2-master-trigger'
+    name: 'compass-os-odl_l2-nofeature-ha-huawei-pod2-colorado-trigger'
+    triggers:
+        - timed: '0 23 * * *'
+- trigger:
+    name: 'compass-os-odl_l3-nofeature-ha-huawei-pod2-colorado-trigger'
     triggers:
         - timed: '0 15 * * *'
 - trigger:
-    name: 'compass-os-ocl-nofeature-ha-huawei-pod2-master-trigger'
+    name: 'compass-os-onos-nofeature-ha-huawei-pod2-colorado-trigger'
+    triggers:
+        - timed: '0 11 * * *'
+- trigger:
+    name: 'compass-os-ocl-nofeature-ha-huawei-pod2-colorado-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-onos-sfc-ha-huawei-pod2-colorado-trigger'
+    triggers:
+        - timed: '0 7 * * *'
+- trigger:
+    name: 'compass-os-odl_l2-moon-ha-huawei-pod2-colorado-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-nosdn-kvm-ha-huawei-pod2-colorado-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: '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-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-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 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-nosdn-nofeature-ha-virtual-brahmaputra-trigger'
+    name: 'compass-os-onos-sfc-ha-virtual-master-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 15 * * *'
 - trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-virtual-brahmaputra-trigger'
+    name: 'compass-os-odl_l2-moon-ha-virtual-master-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 14 * * *'
 - trigger:
-    name: 'compass-os-odl_l3-nofeature-ha-virtual-brahmaputra-trigger'
+    name: 'compass-os-nosdn-kvm-ha-virtual-master-trigger'
     triggers:
         - timed: ''
+
+- trigger:
+    name: 'compass-os-nosdn-nofeature-ha-virtual-colorado-trigger'
+    triggers:
+        - timed: '0 21 * * *'
+- 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-onos-nofeature-ha-virtual-brahmaputra-trigger'
+    name: 'compass-os-ocl-nofeature-ha-virtual-colorado-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-ocl-nofeature-ha-virtual-brahmaputra-trigger'
+    name: 'compass-os-onos-sfc-ha-virtual-colorado-trigger'
+    triggers:
+        - timed: '0 15 * * *'
+- 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: ''