summaryrefslogtreecommitdiffstats
path: root/jjb/apex
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-05-13 15:19:42 -0400
committerTim Rozet <trozet@redhat.com>2016-05-13 15:24:40 -0400
commit69fbbb4564539bf2aecbfd91a48825a8d8beea16 (patch)
tree8ba7a9c210e367562b73cf8ac4db57cf6c059b4e /jjb/apex
parent83d5946dcedcc60ddca6c7538f692d37bdc873ba (diff)
Apex: Enables using slave labeling for apex-verify-master
Change-Id: I5e13f45714f188eaf32a518149b9515572911139 Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'jjb/apex')
-rw-r--r--jjb/apex/apex.yml12
1 files changed, 9 insertions, 3 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 35a6bf730..f63efd4f3 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -18,12 +18,14 @@
gs-pathname: ''
block-stream: 'brahmaputra'
slave: 'intel-pod7'
+ verify-slave: 'apex-verify-master'
- brahmaputra:
branch: 'stable/brahmaputra'
gs-pathname: '/brahmaputra'
block-stream: 'master'
slave: 'opnfv-jump-1'
- disabled: false
+ verify-slave: 'apex-verify-brahmaputra'
+ disabled: true
stream1:
- master:
@@ -31,6 +33,7 @@
gs-pathname: ''
block-stream: 'brahmaputra'
slave: 'intel-pod7'
+ verify-slave: 'apex-verify-master'
stream2:
- brahmaputra:
@@ -38,7 +41,8 @@
gs-pathname: '/brahmaputra'
block-stream: 'master'
slave: 'opnfv-jump-1'
- disabled: false
+ verify-slave: 'apex-verify-brahmaputra'
+ disabled: true
project: 'apex'
@@ -153,7 +157,7 @@
- job-template:
name: 'apex-verify-{stream1}'
- node: '{slave}'
+ node: '{verify-slave}'
parameters:
- apex-parameter:
@@ -220,6 +224,7 @@
OPNFV_CLEAN=yes
git-revision: false
block: true
+ same-node: true
# - trigger-builds:
# - project: 'functest-apex-{slave}-suite-{stream1}'
# predefined-parameters: |
@@ -233,6 +238,7 @@
OPNFV_CLEAN=yes
git-revision: false
block: true
+ same-node: true
- 'apex-workspace-cleanup'
- job-template: