From fc57299e0fe28ad16cae2ba683d93ab187020d6d Mon Sep 17 00:00:00 2001 From: "wu.zhihui" Date: Fri, 26 Aug 2016 15:25:10 +0800 Subject: [PATCH] fuel: Enable triggers of Colorado on zte-pod1 and zte-pod3 Enable triggers of Colorado on zte-pod1 and zte-pod3. Meanwhile, add colorado branch for zte-pod1 and zte-pod3 in Functest and Yardstick. Change-Id: I575d37356c9223935d5975a834589b33f9e7498b Signed-off-by: wu.zhihui --- jjb/fuel/fuel-ci-jobs.yml | 10 ++++++++-- jjb/functest/functest-ci-jobs.yml | 8 ++++++++ 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 8e3de3d75..167877f4f 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 -- 2.16.6