aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>2017-01-25 23:55:25 +0100
committerJan-Simon Möller <jsmoeller@linuxfoundation.org>2017-01-26 00:04:29 +0100
commit5d7ccc6cea67e46fd081f18b653deb1d1208424e (patch)
tree2cea53881799d7c00e32788b4f02db1a915796ff
parenteefb922b660fc02c16bb0289af53d7339f95dd88 (diff)
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>
-rw-r--r--jjb/ci-jjb-AGL/ci-jjb-AGL.yaml2
-rw-r--r--jjb/global-macros.yaml2
-rw-r--r--jjb/sandbox-ci-jjb/sandbox-ci-jjb.yaml4
3 files changed, 2 insertions, 6 deletions
diff --git a/jjb/ci-jjb-AGL/ci-jjb-AGL.yaml b/jjb/ci-jjb-AGL/ci-jjb-AGL.yaml
index aae98e9b..ce2c7776 100644
--- 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 990da1bd..c9fc7b81 100644
--- 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 1fac29c5..288456e4 100644
--- 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"