Adapt single-use for control-slave

And push ci-jjb also to control-slave

Change-Id: Icbda7b132090aa77cd2a6aef1fa1c290d1694f6a
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>

diff --git a/jjb/ci-jjb-AGL/ci-jjb-AGL.yaml b/jjb/ci-jjb-AGL/ci-jjb-AGL.yaml
index aae98e9..ce2c777 100644 (file)
--- a/jjb/ci-jjb-AGL/ci-jjb-AGL.yaml
+++ b/jjb/ci-jjb-AGL/ci-jjb-AGL.yaml
@@ -7,7 +7,7 @@
     name: 'ci-jjb-AGL'
     project-type: matrix
     concurrent: true
-    node: master
+    node: control-node
 
     parameters:
       - string:

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 990da1b..c9fc7b8 100644 (file)
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -316,4 +316,4 @@
             - '2d097b8f-bc4a-4222-b496-4ac6332015d7'
       - ansicolor
       - openstack:
-          single-use: true
+          single-use: false

diff --git a/jjb/sandbox-ci-jjb/sandbox-ci-jjb.yaml b/jjb/sandbox-ci-jjb/sandbox-ci-jjb.yaml
index 1fac29c..288456e 100644 (file)
--- a/jjb/sandbox-ci-jjb/sandbox-ci-jjb.yaml
+++ b/jjb/sandbox-ci-jjb/sandbox-ci-jjb.yaml
@@ -211,8 +211,6 @@
     wrappers:
       - agl-infra-wrappers:
           build-timeout: '{build-timeout}'
-      - openstack:
-          single-use: true
 
     builders:
       - shell: "echo YAY"
@@ -321,8 +319,6 @@
     wrappers:
       - agl-infra-wrappers:
           build-timeout: '{build-timeout}'
-      - openstack:
-          single-use: true
 
     builders:
       - shell: "echo YAY"