summaryrefslogtreecommitdiffstats
path: root/jjb/compass4nfv
diff options
context:
space:
mode:
authormeimei <meimei@huawei.com>2016-09-06 10:13:06 +0800
committermeimei <meimei@huawei.com>2016-10-09 15:47:32 +0800
commit5703c5630be7d46937595ecf8d81d1569f57eb3d (patch)
treeb67d70577bf6e689bcfe289a78ee9cf9c57526cc /jjb/compass4nfv
parent26db2b8f2eca5c9856e5fabb6c0f0d25a17c3e8f (diff)
[compass] put huawei-pod2 into CI resource pool
Change-Id: I8b8cf515d47e6117bfa5804c15fac22ac8b8d90a Signed-off-by: meimei <meimei@huawei.com>
Diffstat (limited to 'jjb/compass4nfv')
-rw-r--r--jjb/compass4nfv/compass-ci-jobs.yml38
1 files changed, 1 insertions, 37 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 16c6695c2..ce500efed 100644
--- 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'
@@ -282,39 +279,6 @@
- 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:
- timed: '0 2 * * *'