From 736a24a0f2dd0494237be8a638cd39a9ed943d6a Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Thu, 5 Apr 2018 17:34:41 -0400 Subject: Apex: Fix conditions for multijob condition actually affects *next* phase execution and not conditional on previous phase. This change fixes the condition so that fetch logs always runs. Change-Id: I50c3f9f9412682ea591c47116d406b5ed81ee2b5 Signed-off-by: Tim Rozet --- jjb/apex/apex-verify-jobs.yml | 3 +-- jjb/apex/apex.yml | 5 ++--- jjb/apex/apex.yml.j2 | 5 ++--- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/jjb/apex/apex-verify-jobs.yml b/jjb/apex/apex-verify-jobs.yml index 6f49ffd78..79b358815 100644 --- a/jjb/apex/apex-verify-jobs.yml +++ b/jjb/apex/apex-verify-jobs.yml @@ -342,7 +342,7 @@ properties-file: detected_scenario - multijob: name: functest-smoke - condition: SUCCESSFUL + condition: ALWAYS projects: - name: 'functest-apex-virtual-suite-{stream}' current-parameters: false @@ -360,7 +360,6 @@ git-revision: false - multijob: name: apex-fetch-logs - condition: ALWAYS projects: - name: 'apex-fetch-logs-{stream}' current-parameters: true diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 48bff6640..80ba50b71 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -456,7 +456,7 @@ git-revision: true - multijob: name: functest-smoke - condition: SUCCESSFUL + condition: ALWAYS projects: - name: 'functest-apex-virtual-suite-{stream}' current-parameters: false @@ -473,7 +473,6 @@ git-revision: false - multijob: name: apex-fetch-logs - condition: ALWAYS projects: - name: 'apex-fetch-logs-{stream}' current-parameters: false @@ -547,6 +546,7 @@ git-revision: false - multijob: name: 'OPNFV Test Suite' + condition: ALWAYS projects: - name: 'apex-testsuite-{scenario}-baremetal-{scenario_stream}' node-parameters: true @@ -558,7 +558,6 @@ git-revision: false - multijob: name: apex-fetch-logs - condition: ALWAYS projects: - name: 'apex-fetch-logs' current-parameters: true diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2 index c72504452..29a93b4d0 100644 --- a/jjb/apex/apex.yml.j2 +++ b/jjb/apex/apex.yml.j2 @@ -298,7 +298,7 @@ git-revision: true - multijob: name: functest-smoke - condition: SUCCESSFUL + condition: ALWAYS projects: - name: 'functest-apex-virtual-suite-{stream}' current-parameters: false @@ -315,7 +315,6 @@ git-revision: false - multijob: name: apex-fetch-logs - condition: ALWAYS projects: - name: 'apex-fetch-logs-{stream}' current-parameters: false @@ -389,6 +388,7 @@ git-revision: false - multijob: name: 'OPNFV Test Suite' + condition: ALWAYS projects: - name: 'apex-testsuite-{scenario}-baremetal-{scenario_stream}' node-parameters: true @@ -400,7 +400,6 @@ git-revision: false - multijob: name: apex-fetch-logs - condition: ALWAYS projects: - name: 'apex-fetch-logs' current-parameters: true -- cgit