From 66baed3706f01f673f6a6cb9ce0a2d3dba8ab492 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Sat, 21 Jul 2018 21:51:25 -0400 Subject: Apex: run csit before tempest Change-Id: I66c0b128fb958285b4bff112586fc45366257256 Signed-off-by: Tim Rozet --- jjb/3rd_party_ci/odl-netvirt.yaml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/jjb/3rd_party_ci/odl-netvirt.yaml b/jjb/3rd_party_ci/odl-netvirt.yaml index 62e4ca198..367568ae1 100644 --- a/jjb/3rd_party_ci/odl-netvirt.yaml +++ b/jjb/3rd_party_ci/odl-netvirt.yaml @@ -148,19 +148,6 @@ node-parameters: true kill-phase-on: FAILURE abort-all-job: true - - 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 - node-parameters: true - kill-phase-on: FAILURE - abort-all-job: false - multijob: name: csit condition: ALWAYS @@ -176,6 +163,19 @@ node-parameters: true kill-phase-on: NEVER abort-all-job: false + - 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 + node-parameters: true + kill-phase-on: FAILURE + abort-all-job: false - multijob: name: postprocess condition: ALWAYS -- cgit 1.2.3-korg