Apex: remove global build slave

Change-Id: I2d4216e63a16baafcebe636107449b334c953f04
Signed-off-by: Tim Rozet <trozet@redhat.com>

diff --git a/jjb/apex/apex-jjb-renderer.py b/jjb/apex/apex-jjb-renderer.py
index da62bc7..6fd83af 100644 (file)
--- 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 495b9b5..4137bff 100644 (file)
--- 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 28aeb4f..8a00d9f 100644 (file)
--- 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