summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-05-11 16:31:21 -0400
committerTim Rozet <trozet@redhat.com>2017-05-11 17:18:01 -0400
commit75b46840416c79cab73fa5decbe7433adffd1954 (patch)
tree629d53da2604035413f3768147a16ae1aac766b2 /jjb
parent036452c344f09ad68bd217649dea960d9c10b984 (diff)
Apex: remove global build slave
Change-Id: I2d4216e63a16baafcebe636107449b334c953f04 Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'jjb')
-rw-r--r--jjb/apex/apex-jjb-renderer.py4
-rw-r--r--jjb/apex/apex.yml5
-rw-r--r--jjb/apex/apex.yml.j23
3 files changed, 6 insertions, 6 deletions
diff --git a/jjb/apex/apex-jjb-renderer.py b/jjb/apex/apex-jjb-renderer.py
index da62bc7ad..6fd83afe9 100644
--- a/jjb/apex/apex-jjb-renderer.py
+++ b/jjb/apex/apex-jjb-renderer.py
@@ -14,6 +14,7 @@ from jinja2 import FileSystemLoader
gspathname = dict()
branch = dict()
+build_slave = dict()
env = Environment(loader=FileSystemLoader('./'), autoescape=True)
with open('scenarios.yaml.hidden') as _:
@@ -31,9 +32,10 @@ for stream in scenarios:
else:
gspathname[stream] = '/' + stream
branch[stream] = 'stable/' + stream
+ build_slave[stream] = 'apex-baremetal-{}'.format(stream)
output = template.render(scenarios=scenarios, gspathname=gspathname,
- branch=branch)
+ branch=branch, build_slave=build_slave)
with open('./apex.yml', 'w') as fh:
fh.write(output)
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 495b9b541..4137bff12 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -1,7 +1,6 @@
- project:
name: 'apex'
project: 'apex'
- build-slave: 'apex-build'
jobs:
- 'apex-verify-{stream}'
- 'apex-verify-gate-{stream}'
@@ -618,7 +617,7 @@
# branch: branch (eg. stable)
project-type: 'multijob'
- node: '{build-slave}'
+ node: 'apex-baremetal-danube'
disabled: false
@@ -949,7 +948,7 @@
# branch: branch (eg. stable)
project-type: 'multijob'
- node: '{build-slave}'
+ node: 'apex-baremetal-master'
disabled: false
diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index 28aeb4f11..8a00d9fd1 100644
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -1,7 +1,6 @@
- project:
name: 'apex'
project: 'apex'
- build-slave: 'apex-build'
jobs:
- 'apex-verify-{stream}'
- 'apex-verify-gate-{stream}'
@@ -618,7 +617,7 @@
# branch: branch (eg. stable)
project-type: 'multijob'
- node: '{build-slave}'
+ node: '{{ build_slave[stream] }}'
disabled: false