diff options
| author |   Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2016-10-10 07:30:08 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-10-10 07:30:08 +0000 |
| commit | 56d2e9a30ceb114678428152e4b54fb52c398ebe (patch) | |
| tree | deab3d1494603a3b6491a301aafe5ab4c026406e /jjb/compass4nfv | |
| parent | 162e331a842eaca01f38ac344816440b2aa0b8f5 (diff) | |
| parent | 5703c5630be7d46937595ecf8d81d1569f57eb3d (diff) | |
Merge "[compass] put huawei-pod2 into CI resource pool"
Diffstat (limited to 'jjb/compass4nfv')
| -rw-r--r-- | jjb/compass4nfv/compass-ci-jobs.yml | 38 |
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 * * *' |