diff options
Diffstat (limited to 'jjb/3rd_party_ci/odl-netvirt.yaml')
| -rw-r--r-- | jjb/3rd_party_ci/odl-netvirt.yaml | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/jjb/3rd_party_ci/odl-netvirt.yaml b/jjb/3rd_party_ci/odl-netvirt.yaml index 4453ee250..bb7d21e11 100644 --- a/jjb/3rd_party_ci/odl-netvirt.yaml +++ b/jjb/3rd_party_ci/odl-netvirt.yaml @@ -152,7 +152,7 @@ name: csit condition: ALWAYS projects: - - name: cperf-apex-csit-{stream} + - name: cperf-apex-csit-master predefined-parameters: | ODL_BRANCH=$BRANCH RC_FILE_PATH=$SNAP_CACHE/overcloudrc @@ -161,27 +161,16 @@ ODL_CONTAINERIZED=false OS_VERSION=$OS_VERSION node-parameters: true - kill-phase-on: NEVER + kill-phase-on: FAILURE abort-all-job: false - - shell: | - if echo $OS_VERSION | grep queens &> /dev/null; then - echo 'REPO=opnfv' > functest_repo - else - echo 'REPO=ollivier' > functest_repo - fi - - inject: - properties-file: functest_repo - multijob: - name: functest - condition: SUCCESSFUL + name: csit-collect-logs + condition: ALWAYS projects: - - name: 'functest-netvirt-virtual-suite-master' + - name: cperf-upload-logs-csit predefined-parameters: | - DEPLOY_SCENARIO=os-odl-nofeature-$TOPOLOGY - FUNCTEST_MODE=testcase - FUNCTEST_SUITE_NAME=tempest_smoke - RC_FILE_PATH=$HOME/cloner-info/overcloudrc - REPO=$REPO + ODL_BRANCH=$BRANCH + OS_VERSION=$OS_VERSION node-parameters: true kill-phase-on: FAILURE abort-all-job: false |