diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/apex/apex.yml | 16 | ||||
| -rw-r--r-- | jjb/apex/scenarios.yaml.hidden | 8 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-ci-jobs.yml | 18 | ||||
| -rwxr-xr-x | jjb/dovetail/dovetail-run.sh | 4 |
4 files changed, 33 insertions, 13 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 6bd2248bd..c858b7f65 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -140,9 +140,9 @@ <<: *master - 'os-odl-sfc-ha': <<: *master - - 'os-odl-fdio-dvr-noha': + - 'os-odl-fdio_dvr-noha': <<: *master - - 'os-odl-fdio-dvr-ha': + - 'os-odl-fdio_dvr-ha': <<: *master - 'os-nosdn-nofeature-noha': <<: *euphrates @@ -182,9 +182,9 @@ <<: *euphrates - 'os-odl-sfc-ha': <<: *euphrates - - 'os-odl-fdio-dvr-noha': + - 'os-odl-fdio_dvr-noha': <<: *euphrates - - 'os-odl-fdio-dvr-ha': + - 'os-odl-fdio_dvr-ha': <<: *euphrates platform: @@ -1809,7 +1809,7 @@ abort-all-job: true git-revision: false - - name: 'apex-os-odl-fdio-dvr-noha-baremetal-master' + - name: 'apex-os-odl-fdio_dvr-noha-baremetal-master' node-parameters: false current-parameters: false predefined-parameters: | @@ -1818,7 +1818,7 @@ abort-all-job: true git-revision: false - - name: 'apex-os-odl-fdio-dvr-ha-baremetal-master' + - name: 'apex-os-odl-fdio_dvr-ha-baremetal-master' node-parameters: false current-parameters: false predefined-parameters: | @@ -2008,7 +2008,7 @@ abort-all-job: true git-revision: false - - name: 'apex-os-odl-fdio-dvr-noha-baremetal-euphrates' + - name: 'apex-os-odl-fdio_dvr-noha-baremetal-euphrates' node-parameters: false current-parameters: false predefined-parameters: | @@ -2017,7 +2017,7 @@ abort-all-job: true git-revision: false - - name: 'apex-os-odl-fdio-dvr-ha-baremetal-euphrates' + - name: 'apex-os-odl-fdio_dvr-ha-baremetal-euphrates' node-parameters: false current-parameters: false predefined-parameters: | diff --git a/jjb/apex/scenarios.yaml.hidden b/jjb/apex/scenarios.yaml.hidden index e7fe92375..a89aa5de2 100644 --- a/jjb/apex/scenarios.yaml.hidden +++ b/jjb/apex/scenarios.yaml.hidden @@ -18,8 +18,8 @@ master: - 'os-nosdn-kvm_ovs_dpdk-ha' - 'os-odl-sfc-noha' - 'os-odl-sfc-ha' - - 'os-odl-fdio-dvr-noha' - - 'os-odl-fdio-dvr-ha' + - 'os-odl-fdio_dvr-noha' + - 'os-odl-fdio_dvr-ha' euphrates: - 'os-nosdn-nofeature-noha' - 'os-nosdn-nofeature-ha' @@ -40,8 +40,8 @@ euphrates: - 'os-nosdn-kvm_ovs_dpdk-ha' - 'os-odl-sfc-noha' - 'os-odl-sfc-ha' - - 'os-odl-fdio-dvr-noha' - - 'os-odl-fdio-dvr-ha' + - 'os-odl-fdio_dvr-noha' + - 'os-odl-fdio_dvr-ha' danube: - 'os-nosdn-nofeature-noha' - 'os-nosdn-nofeature-ha' diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml index 7b25a9b2b..b107c6520 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yml +++ b/jjb/compass4nfv/compass-ci-jobs.yml @@ -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}' diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh index 1b09cca08..2cbb94766 100755 --- a/jjb/dovetail/dovetail-run.sh +++ b/jjb/dovetail/dovetail-run.sh @@ -152,8 +152,10 @@ dovetail_home_volume="-v ${DOVETAIL_HOME}:${DOVETAIL_HOME}" echo "Dovetail: Pulling image opnfv/dovetail:${DOCKER_TAG}" docker pull opnfv/dovetail:$DOCKER_TAG >$redirect +env4bgpvpn="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP}" + cmd="docker run ${opts} -e DOVETAIL_HOME=${DOVETAIL_HOME} ${docker_volume} ${dovetail_home_volume} \ - ${sshkey} opnfv/dovetail:${DOCKER_TAG} /bin/bash" + ${sshkey} ${env4bgpvpn} opnfv/dovetail:${DOCKER_TAG} /bin/bash" echo "Dovetail: running docker run command: ${cmd}" ${cmd} >${redirect} sleep 5 |