diff options
Diffstat (limited to 'jjb/compass4nfv')
| -rw-r--r-- | jjb/compass4nfv/compass-ci-jobs.yml | 46 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-deploy.sh | 2 |
2 files changed, 33 insertions, 15 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml index 74a134eda..b107c6520 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yml +++ b/jjb/compass4nfv/compass-ci-jobs.yml @@ -95,7 +95,7 @@ - 'os-odl-sfc-ha': disabled: false auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' - - 'os-nosdn-dpdk-ha': + - 'os-nosdn-ovs_dpdk-ha': disabled: false auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' - 'k8-nosdn-nofeature-ha': @@ -116,7 +116,7 @@ - 'os-odl-sfc-noha': disabled: false auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' - - 'os-nosdn-dpdk-noha': + - 'os-nosdn-ovs_dpdk-noha': disabled: false auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' @@ -290,6 +290,24 @@ build-step-failure-threshold: 'never' failure-threshold: 'never' unstable-threshold: 'FAILURE' + - conditional-step: + condition-kind: and + condition-operands: + - condition-kind: regex-match + regex: os-nosdn-nofeature-ha + label: '{scenario}' + steps: + - trigger-builds: + - project: 'bottlenecks-compass-posca_stress_ping-{pod}-daily-{stream}' + current-parameters: false + predefined-parameters: + DEPLOY_SCENARIO={scenario} + block: true + same-node: true + block-thresholds: + build-step-failure-threshold: 'never' + failure-threshold: 'never' + unstable-threshold: 'FAILURE' - job-template: name: 'compass-deploy-{pod}-daily-{stream}' @@ -424,7 +442,7 @@ triggers: - timed: '' - trigger: - name: 'compass-os-nosdn-dpdk-ha-baremetal-centos-master-trigger' + name: 'compass-os-nosdn-ovs_dpdk-ha-baremetal-centos-master-trigger' triggers: - timed: '' - trigger: @@ -460,7 +478,7 @@ triggers: - timed: '' - trigger: - name: 'compass-os-nosdn-dpdk-noha-baremetal-centos-master-trigger' + name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-centos-master-trigger' triggers: - timed: '' @@ -504,7 +522,7 @@ triggers: - timed: '' - trigger: - name: 'compass-os-nosdn-dpdk-ha-huawei-pod7-danube-trigger' + name: 'compass-os-nosdn-ovs_dpdk-ha-huawei-pod7-danube-trigger' triggers: - timed: '' - trigger: @@ -540,7 +558,7 @@ triggers: - timed: '' - trigger: - name: 'compass-os-nosdn-dpdk-noha-huawei-pod7-danube-trigger' + name: 'compass-os-nosdn-ovs_dpdk-noha-huawei-pod7-danube-trigger' triggers: - timed: '' #-------------------- @@ -583,7 +601,7 @@ triggers: - timed: '0 14 * * *' - trigger: - name: 'compass-os-nosdn-dpdk-ha-baremetal-master-trigger' + name: 'compass-os-nosdn-ovs_dpdk-ha-baremetal-master-trigger' triggers: - timed: '0 16 * * *' - trigger: @@ -619,7 +637,7 @@ triggers: - timed: '' - trigger: - name: 'compass-os-nosdn-dpdk-noha-baremetal-master-trigger' + name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-master-trigger' triggers: - timed: '' @@ -663,7 +681,7 @@ triggers: - timed: '0 13 * * *' - trigger: - name: 'compass-os-nosdn-dpdk-ha-baremetal-euphrates-trigger' + name: 'compass-os-nosdn-ovs_dpdk-ha-baremetal-euphrates-trigger' triggers: - timed: '0 9 * * *' - trigger: @@ -699,7 +717,7 @@ triggers: - timed: '' - trigger: - name: 'compass-os-nosdn-dpdk-noha-baremetal-euphrates-trigger' + name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-euphrates-trigger' triggers: - timed: '' @@ -743,7 +761,7 @@ triggers: - timed: '0 13 * * *' - trigger: - name: 'compass-os-nosdn-dpdk-ha-virtual-master-trigger' + name: 'compass-os-nosdn-ovs_dpdk-ha-virtual-master-trigger' triggers: - timed: '0 17 * * *' - trigger: @@ -779,7 +797,7 @@ triggers: - timed: '0 20 * * *' - trigger: - name: 'compass-os-nosdn-dpdk-noha-virtual-master-trigger' + name: 'compass-os-nosdn-ovs_dpdk-noha-virtual-master-trigger' triggers: - timed: '0 11 * * *' @@ -823,7 +841,7 @@ triggers: - timed: '0 16 * * *' - trigger: - name: 'compass-os-nosdn-dpdk-ha-virtual-euphrates-trigger' + name: 'compass-os-nosdn-ovs_dpdk-ha-virtual-euphrates-trigger' triggers: - timed: '0 14 * * *' - trigger: @@ -859,6 +877,6 @@ triggers: - timed: '0 19 * * *' - trigger: - name: 'compass-os-nosdn-dpdk-noha-virtual-euphrates-trigger' + name: 'compass-os-nosdn-ovs_dpdk-noha-virtual-euphrates-trigger' triggers: - timed: '0 12 * * *' diff --git a/jjb/compass4nfv/compass-deploy.sh b/jjb/compass4nfv/compass-deploy.sh index 9d4ae5175..ad069a57c 100644 --- a/jjb/compass4nfv/compass-deploy.sh +++ b/jjb/compass4nfv/compass-deploy.sh @@ -39,7 +39,7 @@ elif [[ "${DEPLOY_SCENARIO}" =~ "-onos" ]]; then export NETWORK_CONF_FILE=network_onos.yml elif [[ "${DEPLOY_SCENARIO}" =~ "-openo" ]]; then export NETWORK_CONF_FILE=network_openo.yml -elif [[ "${DEPLOY_SCENARIO}" =~ "-dpdk" ]]; then +elif [[ "${DEPLOY_SCENARIO}" =~ "-ovs_dpdk" ]]; then export NETWORK_CONF_FILE=network_dpdk.yml else export NETWORK_CONF_FILE=network.yml |