From c1ffe7b01ac0eb6e386c6eaa4ed497f8bdc8434a Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Tue, 15 Aug 2017 21:52:01 -0400 Subject: [PATCH] Apex: fixes test suite always running even when deploy fails MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit According to the multijob builder, condtion: "condition (str) – when to trigger the other job". Other job in this case means the next job I believe. Change-Id: I084fffc80584ad683345f6040ec0081c16513c8d Signed-off-by: Tim Rozet --- jjb/apex/apex.yml | 3 +-- jjb/apex/apex.yml.j2 | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 3f6d4c0cd..07181fcad 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -673,7 +673,7 @@ description: "Deployed on $NODE_NAME - Scenario: $DEPLOY_SCENARIO" - multijob: name: 'Baremetal Deploy' - condition: ALWAYS + condition: SUCCESSFUL projects: - name: 'apex-deploy-baremetal-{scenario_stream}' node-parameters: true @@ -688,7 +688,6 @@ git-revision: false - multijob: name: 'OPNFV Test Suite' - condition: SUCCESSFUL projects: - name: 'apex-testsuite-{scenario}-baremetal-{scenario_stream}' node-parameters: true diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2 index 5d7f150cd..2d760f854 100644 --- a/jjb/apex/apex.yml.j2 +++ b/jjb/apex/apex.yml.j2 @@ -585,7 +585,7 @@ description: "Deployed on $NODE_NAME - Scenario: $DEPLOY_SCENARIO" - multijob: name: 'Baremetal Deploy' - condition: ALWAYS + condition: SUCCESSFUL projects: - name: 'apex-deploy-baremetal-{scenario_stream}' node-parameters: true @@ -600,7 +600,6 @@ git-revision: false - multijob: name: 'OPNFV Test Suite' - condition: SUCCESSFUL projects: - name: 'apex-testsuite-{scenario}-baremetal-{scenario_stream}' node-parameters: true -- 2.16.6