[compass] put huawei-pod2 into CI resource pool

[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 efd1fc1..ce500ef 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,15 @@
         - baremetal:
             slave-label: compass-baremetal
             os-version: 'trusty'
-            <<: *brahmaputra
+            <<: *colorado
         - virtual:
             slave-label: compass-virtual
             os-version: 'trusty'
-            <<: *brahmaputra
+            <<: *colorado
 #--------------------------------
 #        master
 #--------------------------------
-        - huawei-pod2:
+        - huawei-pod5:
             slave-label: '{pod}'
             os-version: 'centos7'
             <<: *master
@@ -99,6 +99,7 @@
             use-build-blocker: true
             blocking-jobs:
                 - 'compass-os-.*?-{pod}-daily-.*?'
+                - 'compass-os-.*?-baremetal-daily-.*?'
                 - 'compass-verify-[^-]*'
             block-level: 'NODE'
 
@@ -245,35 +246,35 @@
 # 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-pod2-master-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-pod2-master-trigger'
+    name: 'compass-os-odl_l3-nofeature-ha-huawei-pod5-master-trigger'
     triggers:
         - 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: ''
+        - 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: '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-ha-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: ''
 
@@ -311,35 +312,35 @@
         - 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-ha-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: ''
 
@@ -377,34 +378,34 @@
         - 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-ha-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: ''