From 542711c094e9aed521e6462982c792c1e5d2392f Mon Sep 17 00:00:00 2001 From: wutianwei Date: Tue, 27 Feb 2018 16:25:00 +0800 Subject: [compass4nfv]trigger k8s on baremetal pod 1. add the trigger k8s on baremetal 2. modify the default DEPLOY_SCENARIO Change-Id: I9d216c12905b36b4fbba7d9214fcf6fccf1d79c4 Signed-off-by: wutianwei --- jjb/compass4nfv/compass-ci-jobs.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'jjb/compass4nfv') diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml index 1cf81a179..7ce9e3a60 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yml +++ b/jjb/compass4nfv/compass-ci-jobs.yml @@ -174,6 +174,7 @@ installer: '{installer}' gs-pathname: '{gs-pathname}' ppa-pathname: '{ppa-pathname}' + scenario: '{scenario}' - '{slave-label}-defaults' - '{installer}-defaults' @@ -341,6 +342,7 @@ installer: '{installer}' gs-pathname: '{gs-pathname}' ppa-pathname: '{ppa-pathname}' + scenario: '{scenario}' - '{slave-label}-defaults' - '{installer}-defaults' @@ -387,6 +389,7 @@ installer: '{installer}' gs-pathname: '{gs-pathname}' ppa-pathname: '{ppa-pathname}' + scenario: '{scenario}' - '{slave-label}-defaults' - '{installer}-defaults' @@ -434,7 +437,7 @@ description: "Directory where the logs will be located upon the completion of the collection." - string: name: DEPLOY_SCENARIO - default: 'os-nosdn-nofeature-ha' + default: '{scenario}' description: "Scenario to deploy with." - string: name: COMPASS_OS_VERSION @@ -498,7 +501,7 @@ - trigger: name: 'compass-k8-nosdn-nofeature-ha-baremetal-centos-master-trigger' triggers: - - timed: '' + - timed: '0 6 * * *' - trigger: name: 'compass-os-nosdn-bar-ha-baremetal-centos-master-trigger' triggers: @@ -679,7 +682,7 @@ - trigger: name: 'compass-k8-nosdn-nofeature-ha-baremetal-master-trigger' triggers: - - timed: '' + - timed: '0 10 2-30/2 * *' - trigger: name: 'compass-os-odl-sfc-ha-baremetal-master-trigger' triggers: @@ -691,7 +694,7 @@ - trigger: name: 'compass-k8-nosdn-stor4nfv-ha-baremetal-master-trigger' triggers: - - timed: '' + - timed: '0 16 1-29/2 * *' # --------------------- # noha-baremetal-master -- cgit 1.2.3-korg