summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-05-16 12:31:53 -0400
committerTim Rozet <trozet@redhat.com>2016-05-16 12:31:53 -0400
commit137ef7912881dc6ebb3cf93ed6f2d6d3cd8fadfa (patch)
tree673d7a0857c0713112f7450505294e8b4223f3a5 /jjb
parent69fbbb4564539bf2aecbfd91a48825a8d8beea16 (diff)
Apex: Migrates master daily to label driven slave
Change-Id: I898c0abe92efa774ab878759be2456a4ad2de2d2 Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'jjb')
-rw-r--r--jjb/apex/apex.yml9
1 files changed, 8 insertions, 1 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index f63efd4f3..282ae7b54 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -19,12 +19,14 @@
block-stream: 'brahmaputra'
slave: 'intel-pod7'
verify-slave: 'apex-verify-master'
+ daily-slave: 'apex-daily-master'
- brahmaputra:
branch: 'stable/brahmaputra'
gs-pathname: '/brahmaputra'
block-stream: 'master'
slave: 'opnfv-jump-1'
verify-slave: 'apex-verify-brahmaputra'
+ daily-slave: 'apex-daily-brahmaputra'
disabled: true
stream1:
@@ -34,6 +36,7 @@
block-stream: 'brahmaputra'
slave: 'intel-pod7'
verify-slave: 'apex-verify-master'
+ daily-slave: 'apex-daily-master'
stream2:
- brahmaputra:
@@ -42,6 +45,7 @@
block-stream: 'master'
slave: 'opnfv-jump-1'
verify-slave: 'apex-verify-brahmaputra'
+ daily-slave: 'apex-daily-brahmaputra'
disabled: true
project: 'apex'
@@ -581,7 +585,7 @@
# Required Variables:
# stream: branch with - in place of / (eg. stable)
# branch: branch (eg. stable)
- node: '{slave}'
+ node: '{daily-slave}'
disabled: false
@@ -621,12 +625,14 @@
BUILD_DIRECTORY=apex-build-{stream1}/build
OPNFV_CLEAN=yes
git-revision: true
+ same-node: true
block: true
- trigger-builds:
- project: 'functest-apex-{slave}-daily-{stream1}'
predefined-parameters:
DEPLOY_SCENARIO=os-nosdn-nofeature-ha
block: true
+ same-node: true
block-thresholds:
build-step-failure-threshold: 'never'
failure-threshold: 'never'
@@ -636,6 +642,7 @@
predefined-parameters:
DEPLOY_SCENARIO=os-nosdn-nofeature-ha
block: true
+ same-node: true
block-thresholds:
build-step-failure-threshold: 'never'
failure-threshold: 'never'