[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 16c6695..ce500ef 100644 (file)
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -39,10 +39,6 @@
 #--------------------------------
 #        master
 #--------------------------------
-        - huawei-pod2:
-            slave-label: '{pod}'
-            os-version: 'trusty'
-            <<: *colorado
         - huawei-pod5:
             slave-label: '{pod}'
             os-version: 'centos7'
@@ -103,6 +99,7 @@
             use-build-blocker: true
             blocking-jobs:
                 - 'compass-os-.*?-{pod}-daily-.*?'
+                - 'compass-os-.*?-baremetal-daily-.*?'
                 - 'compass-verify-[^-]*'
             block-level: 'NODE'
 
@@ -281,39 +278,6 @@
     triggers:
         - timed: ''
 
-- trigger:
-    name: 'compass-os-nosdn-nofeature-ha-huawei-pod2-colorado-trigger'
-    triggers:
-        - timed: '0 19 * * *'
-- 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-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: