diff options
| -rw-r--r-- | jjb/compass4nfv/compass-ci-jobs.yaml | 20 | ||||
| -rw-r--r-- | jjb/functest/functest-kubernetes.yaml | 2 | ||||
| -rw-r--r-- | jjb/functest/functest.yaml | 3 |
3 files changed, 15 insertions, 10 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yaml b/jjb/compass4nfv/compass-ci-jobs.yaml index 9dc80748d..467210201 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yaml +++ b/jjb/compass4nfv/compass-ci-jobs.yaml @@ -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: diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml index 3bdb61d6f..1c2ed83be 100644 --- a/jjb/functest/functest-kubernetes.yaml +++ b/jjb/functest/functest-kubernetes.yaml @@ -8,8 +8,6 @@ repo: 'opnfv' port: tag: - - latest: - branch: master - hunter: branch: stable/hunter diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml index 49513521e..29fd156a1 100644 --- a/jjb/functest/functest.yaml +++ b/jjb/functest/functest.yaml @@ -404,6 +404,7 @@ <<: *functest-jobs - multijob: name: opnfv/functest-vnf:{tag} + execution-type: SEQUENTIALLY projects: - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run' <<: *functest-jobs @@ -666,6 +667,7 @@ <<: *functest-jobs - multijob: name: opnfv/functest-vnf:{tag} + execution-type: SEQUENTIALLY projects: - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run' <<: *functest-jobs @@ -838,6 +840,7 @@ <<: *functest-jobs - multijob: name: opnfv/functest-vnf:{tag} + execution-type: SEQUENTIALLY projects: - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run' <<: *functest-jobs |