diff options
| author |   Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2016-09-01 07:25:44 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-01 07:25:44 +0000 |
| commit | 663fe8b3e52c0126e8ff34f45d1944f56afee740 (patch) | |
| tree | 417223362deb9ee8b495c7297441aa2c197e6550 | |
| parent | c355f9df975349b6ccd09075f178841d035b631e (diff) | |
| parent | fc57299e0fe28ad16cae2ba683d93ab187020d6d (diff) | |
Merge "fuel: Enable triggers of Colorado on zte-pod1 and zte-pod3"
| -rw-r--r-- | jjb/fuel/fuel-ci-jobs.yml | 10 | ||||
| -rw-r--r-- | jjb/functest/functest-ci-jobs.yml | 8 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick-ci-jobs.yml | 10 |
3 files changed, 26 insertions, 2 deletions
diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml index 0d31c99b4..ff2c6e855 100644 --- a/jjb/fuel/fuel-ci-jobs.yml +++ b/jjb/fuel/fuel-ci-jobs.yml @@ -50,6 +50,12 @@ - zte-pod3: slave-label: zte-pod3 <<: *master + - zte-pod1: + slave-label: zte-pod1 + <<: *colorado + - zte-pod3: + slave-label: zte-pod3 + <<: *colorado #-------------------------------- # scenarios #-------------------------------- @@ -802,7 +808,7 @@ - trigger: name: 'fuel-os-odl_l2-nofeature-ha-zte-pod1-daily-colorado-trigger' triggers: - - timed: '' + - timed: '0 2 * * *' - trigger: name: 'fuel-os-odl_l3-nofeature-ha-zte-pod1-daily-colorado-trigger' triggers: @@ -979,7 +985,7 @@ - trigger: name: 'fuel-os-nosdn-kvm-ha-zte-pod3-daily-colorado-trigger' triggers: - - timed: '' + - timed: '0 18 * * *' - trigger: name: 'fuel-os-nosdn-ovs-ha-zte-pod3-daily-colorado-trigger' triggers: diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml index 3070c2535..c31eae737 100644 --- a/jjb/functest/functest-ci-jobs.yml +++ b/jjb/functest/functest-ci-jobs.yml @@ -127,6 +127,10 @@ slave-label: '{pod}' installer: fuel <<: *master + - zte-pod1: + slave-label: '{pod}' + installer: fuel + <<: *colorado - zte-pod2: slave-label: '{pod}' installer: fuel @@ -135,6 +139,10 @@ slave-label: '{pod}' installer: fuel <<: *master + - zte-pod3: + slave-label: '{pod}' + installer: fuel + <<: *colorado - arm-pod1: slave-label: '{pod}' installer: fuel diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml index d9fb43555..c2dbfcdd0 100644 --- a/jjb/yardstick/yardstick-ci-jobs.yml +++ b/jjb/yardstick/yardstick-ci-jobs.yml @@ -121,6 +121,11 @@ installer: fuel auto-trigger-name: 'daily-trigger-disabled' <<: *master + - zte-pod1: + slave-label: '{pod}' + installer: fuel + auto-trigger-name: 'daily-trigger-disabled' + <<: *colorado - zte-pod2: slave-label: '{pod}' installer: fuel @@ -131,6 +136,11 @@ installer: fuel auto-trigger-name: 'daily-trigger-disabled' <<: *master + - zte-pod3: + slave-label: '{pod}' + installer: fuel + auto-trigger-name: 'daily-trigger-disabled' + <<: *colorado - arm-pod1: slave-label: '{pod}' installer: fuel |