From 9d40386d93630fc726271d0f904bf9b4a1f8c071 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Fri, 27 Jul 2018 13:33:09 -0400 Subject: CPERF: Update netvirt verify tests Changes-Include: - Disable functest (we only care about csit passing for netvirt) - Fix trigger of csit job for other snapshot versions (always use master for now) - Fix csit always returning 0 even when tests fail Change-Id: I30a51fa391aac692b122f1ebf7bf73ffdb61ca29 Signed-off-by: Tim Rozet --- jjb/3rd_party_ci/odl-netvirt.yaml | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) (limited to 'jjb/3rd_party_ci/odl-netvirt.yaml') diff --git a/jjb/3rd_party_ci/odl-netvirt.yaml b/jjb/3rd_party_ci/odl-netvirt.yaml index 4453ee250..98c85db19 100644 --- a/jjb/3rd_party_ci/odl-netvirt.yaml +++ b/jjb/3rd_party_ci/odl-netvirt.yaml @@ -150,9 +150,9 @@ abort-all-job: true - multijob: name: csit - condition: ALWAYS + condition: SUCCESSFUL projects: - - name: cperf-apex-csit-{stream} + - name: cperf-apex-csit-master predefined-parameters: | ODL_BRANCH=$BRANCH RC_FILE_PATH=$SNAP_CACHE/overcloudrc @@ -161,28 +161,6 @@ ODL_CONTAINERIZED=false OS_VERSION=$OS_VERSION node-parameters: true - kill-phase-on: NEVER - 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 - projects: - - name: 'functest-netvirt-virtual-suite-master' - 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 - node-parameters: true kill-phase-on: FAILURE abort-all-job: false - multijob: -- cgit 1.2.3-korg