diff options
Diffstat (limited to 'jjb/compass4nfv')
-rw-r--r-- | jjb/compass4nfv/compass-ci-jobs.yml | 76 |
1 files changed, 71 insertions, 5 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml index 81d76d559..7ce9e3a60 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yml +++ b/jjb/compass4nfv/compass-ci-jobs.yml @@ -123,6 +123,12 @@ - 'os-nosdn-bar-ha': disabled: false auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' + - 'k8-nosdn-stor4nfv-ha': + disabled: false + auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' + - 'k8-nosdn-stor4nfv-noha': + disabled: false + auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' jobs: - 'compass-{scenario}-{pod}-daily-{stream}' @@ -168,9 +174,7 @@ installer: '{installer}' gs-pathname: '{gs-pathname}' ppa-pathname: '{ppa-pathname}' - - string: - name: DEPLOY_SCENARIO - default: '{scenario}' + scenario: '{scenario}' - '{slave-label}-defaults' - '{installer}-defaults' @@ -338,6 +342,7 @@ installer: '{installer}' gs-pathname: '{gs-pathname}' ppa-pathname: '{ppa-pathname}' + scenario: '{scenario}' - '{slave-label}-defaults' - '{installer}-defaults' @@ -384,6 +389,7 @@ installer: '{installer}' gs-pathname: '{gs-pathname}' ppa-pathname: '{ppa-pathname}' + scenario: '{scenario}' - '{slave-label}-defaults' - '{installer}-defaults' @@ -429,6 +435,17 @@ name: LOG_DIRECTORY default: $WORKSPACE/log_output description: "Directory where the logs will be located upon the completion of the collection." + - string: + name: DEPLOY_SCENARIO + default: '{scenario}' + description: "Scenario to deploy with." + - string: + name: COMPASS_OS_VERSION + default: '' + - string: + name: COMPASS_OPENSTACK_VERSION + default: '' + ######################## # trigger macros @@ -484,11 +501,15 @@ - 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: - timed: '' # '0 19 * * *' +- trigger: + name: 'compass-k8-nosdn-stor4nfv-ha-baremetal-centos-master-trigger' + triggers: + - timed: '' # ---------------------------- # noha-baremetal-centos-master @@ -517,6 +538,11 @@ name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-centos-master-trigger' triggers: - timed: '' +- trigger: + name: 'compass-k8-nosdn-stor4nfv-noha-baremetal-centos-master-trigger' + triggers: + - timed: '' + # -------------------------- # ha-huawei-pod7-danube @@ -573,6 +599,10 @@ name: 'compass-os-nosdn-bar-ha-huawei-pod7-danube-trigger' triggers: - timed: '' # '0 19 * * *' +- trigger: + name: 'compass-k8-nosdn-stor4nfv-ha-huawei-pod7-danube-trigger' + triggers: + - timed: '' # ---------------------------- # noha-huawei-pod7-danube @@ -601,6 +631,10 @@ name: 'compass-os-nosdn-ovs_dpdk-noha-huawei-pod7-danube-trigger' triggers: - timed: '' +- trigger: + name: 'compass-k8-nosdn-stor4nfv-noha-huawei-pod7-danube-trigger' + triggers: + - timed: '' # ------------------- # ha-baremetal-master @@ -648,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: @@ -657,6 +691,10 @@ name: 'compass-os-nosdn-bar-ha-baremetal-master-trigger' triggers: - timed: '0 2 2-30/2 * *' +- trigger: + name: 'compass-k8-nosdn-stor4nfv-ha-baremetal-master-trigger' + triggers: + - timed: '0 16 1-29/2 * *' # --------------------- # noha-baremetal-master @@ -685,6 +723,10 @@ name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-master-trigger' triggers: - timed: '' +- trigger: + name: 'compass-k8-nosdn-stor4nfv-noha-baremetal-master-trigger' + triggers: + - timed: '' # ------------------- # ha-baremetal-euphrates @@ -741,6 +783,10 @@ name: 'compass-os-nosdn-bar-ha-baremetal-euphrates-trigger' triggers: - timed: '0 21 1-29/2 * *' +- trigger: + name: 'compass-k8-nosdn-stor4nfv-ha-baremetal-euphrates-trigger' + triggers: + - timed: '' # --------------------- # noha-baremetal-euphrates @@ -769,6 +815,10 @@ name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-euphrates-trigger' triggers: - timed: '' +- trigger: + name: 'compass-k8-nosdn-stor4nfv-noha-baremetal-euphrates-trigger' + triggers: + - timed: '' # ----------------- # ha-virtual-master @@ -825,6 +875,10 @@ name: 'compass-os-nosdn-bar-ha-virtual-master-trigger' triggers: - timed: '0 17 1-29/2 * *' +- trigger: + name: 'compass-k8-nosdn-stor4nfv-ha-virtual-master-trigger' + triggers: + - timed: '0 15 2-30/2 * *' # ------------------- # noha-virtual-master @@ -853,6 +907,10 @@ name: 'compass-os-nosdn-ovs_dpdk-noha-virtual-master-trigger' triggers: - timed: '0 11 2-30/2 * *' +- trigger: + name: 'compass-k8-nosdn-stor4nfv-noha-virtual-master-trigger' + triggers: + - timed: '0 10 2-30/2 * *' # ----------------- # ha-virtual-euphrates @@ -909,6 +967,10 @@ name: 'compass-os-nosdn-bar-ha-virtual-euphrates-trigger' triggers: - timed: '0 19 1-29/2 * *' +- trigger: + name: 'compass-k8-nosdn-stor4nfv-ha-virtual-euphrates-trigger' + triggers: + - timed: '' # '0 14 1-29/2 * *' # ------------------- # noha-virtual-euphrates @@ -937,3 +999,7 @@ name: 'compass-os-nosdn-ovs_dpdk-noha-virtual-euphrates-trigger' triggers: - timed: '0 12 2-30/2 * *' +- trigger: + name: 'compass-k8-nosdn-stor4nfv-noha-virtual-euphrates-trigger' + triggers: + - timed: '' # '0 12 2-30/2 * *' |