X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcompass4nfv%2Fcompass-ci-jobs.yaml;h=cda7399ca01c39235fc57814030bca2eb011c1fc;hb=b7871b1916fc8941c39950a9fb05308432a3a065;hp=9dc80748dbc41383cdd79f25767b33ce697072af;hpb=bede394dae3cc0f577a35a10880ea1f9fceeebbc;p=releng.git diff --git a/jjb/compass4nfv/compass-ci-jobs.yaml b/jjb/compass4nfv/compass-ci-jobs.yaml index 9dc80748d..cda7399ca 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yaml +++ b/jjb/compass4nfv/compass-ci-jobs.yaml @@ -54,7 +54,7 @@ # master # ------------------------------- - baremetal-centos: - slave-label: 'intel-pod17' + slave-label: compass-baremetal-master os-version: 'centos7' <<: *master # ------------------------------- @@ -219,6 +219,7 @@ # only run on os-(nosdn|odl_l3)-nofeature-ha scenario # run with testsuite default, testarea mandatory, dovetail docker image with latest tag # run with testsuite default, testarea optional, dovetail docker image with latest tag + # run with testsuite proposed_tests, testarea optional, dovetail docker image with latest tag - conditional-step: condition-kind: and condition-operands: @@ -238,14 +239,6 @@ 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|odl_l3)-nofeature-ha - label: '{scenario}' - steps: - - trigger-builds: - project: 'dovetail-compass-{pod}-default-optional-{stream}' current-parameters: false predefined-parameters: | @@ -257,6 +250,17 @@ build-step-failure-threshold: 'never' failure-threshold: 'never' unstable-threshold: 'FAILURE' + - project: 'dovetail-compass-{pod}-proposed_tests-optional-{stream}' + current-parameters: false + predefined-parameters: | + DOCKER_TAG=latest + DEPLOY_SCENARIO={scenario} + block: true + same-node: true + block-thresholds: + build-step-failure-threshold: 'never' + failure-threshold: 'never' + unstable-threshold: 'FAILURE' - conditional-step: condition-kind: and condition-operands: