diff options
| author |   Jun Li <matthew.lijun@huawei.com> | 2016-09-18 03:58:10 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-18 03:58:10 +0000 |
| commit | 9736d720913dfbd96492bfb2e15e2c7f7bcd0947 (patch) | |
| tree | 515cdfef062efbdcce27a47193a9b09467ccc54e /jjb/compass4nfv/compass-ci-jobs.yml | |
| parent | d86a27d9b9bd207918a90c367e1edd735f4443b7 (diff) | |
| parent | bea13f2d41817938b98d471dfa3fc5b83e4e362d (diff) | |
Merge "[compass] use new pod to run compass jobs"
Diffstat (limited to 'jjb/compass4nfv/compass-ci-jobs.yml')
| -rw-r--r-- | jjb/compass4nfv/compass-ci-jobs.yml | 53 |
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: '' |