summaryrefslogtreecommitdiffstats
path: root/jjb/compass4nfv
diff options
context:
space:
mode:
authormeimei <meimei@huawei.com>2016-09-12 17:09:50 +0800
committermeimei <meimei@huawei.com>2016-09-13 17:41:53 +0800
commitbea13f2d41817938b98d471dfa3fc5b83e4e362d (patch)
tree52d6f59386a9e5c67da1a66f9c10f34bd1b2a55b /jjb/compass4nfv
parentafe8581e20575110e299ebfb4c63f89ac7625ecc (diff)
[compass] use new pod to run compass jobs
Change-Id: I9c6ee092cea755aea58a91a696cb338e1eb5df8b Signed-off-by: meimei <meimei@huawei.com>
Diffstat (limited to 'jjb/compass4nfv')
-rw-r--r--jjb/compass4nfv/compass-ci-jobs.yml53
1 files changed, 45 insertions, 8 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 946ecac79..16c6695c2 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -41,6 +41,10 @@
#--------------------------------
- huawei-pod2:
slave-label: '{pod}'
+ os-version: 'trusty'
+ <<: *colorado
+ - huawei-pod5:
+ slave-label: '{pod}'
os-version: 'centos7'
<<: *master
@@ -245,35 +249,68 @@
# 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: '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-moon-ha-huawei-pod5-master-trigger'
triggers:
- timed: ''
- trigger:
- name: 'compass-os-ocl-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-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-onos-sfc-ha-huawei-pod2-master-trigger'
+ name: 'compass-os-ocl-nofeature-ha-huawei-pod2-colorado-trigger'
triggers:
- timed: ''
- trigger:
- name: 'compass-os-odl_l2-moon-ha-huawei-pod2-master-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-master-trigger'
+ name: 'compass-os-nosdn-kvm-ha-huawei-pod2-colorado-trigger'
triggers:
- timed: ''