summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2018-04-05 17:34:41 -0400
committerTim Rozet <trozet@redhat.com>2018-04-05 17:34:41 -0400
commit736a24a0f2dd0494237be8a638cd39a9ed943d6a (patch)
treebe2f6406ee7ac3cdc935396bf56e8a1614911256 /jjb
parenta6c908b3bd7e698ab2c593604b0141276fc77f3e (diff)
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 <trozet@redhat.com>
Diffstat (limited to 'jjb')
-rw-r--r--jjb/apex/apex-verify-jobs.yml3
-rw-r--r--jjb/apex/apex.yml5
-rw-r--r--jjb/apex/apex.yml.j25
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