From ebe5abbd69fa5e9ed0dc7e3503d8b9aa1e265102 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Thu, 22 Dec 2016 11:11:15 -0500 Subject: [PATCH] Fix include logic for nodepool dsvm jobs We incorrectly setup our JJB template to pass variables to control which images are built. Thanks to clarkb for explaining this. Change-Id: Id6595e93d3bf079becd6f8a027535225863efbc4 Signed-off-by: Paul Belanger --- jenkins/jobs/nodepool.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/jenkins/jobs/nodepool.yaml b/jenkins/jobs/nodepool.yaml index 5f4fdd3c54..884e25c053 100644 --- a/jenkins/jobs/nodepool.yaml +++ b/jenkins/jobs/nodepool.yaml @@ -95,17 +95,17 @@ export DEVSTACK_LOCAL_CONFIG+=$'\n'"LIBS_FROM_GIT=diskimage-builder,glean,shade" if [ "{images}" == "-redhat" ] ; then - export NODEPOOL_PAUSE_CENTOS_7_DIB=false - export NODEPOOL_PAUSE_FEDORA_24_DIB=false - export NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB=true - export NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=true - export NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=true + export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_CENTOS_7_DIB=false" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_FEDORA_24_DIB=false" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB=true" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=true" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=true" elif [ "{images}" == "-debian" ] ; then - export NODEPOOL_PAUSE_CENTOS_7_DIB=true - export NODEPOOL_PAUSE_FEDORA_24_DIB=true - export NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB=false - export NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=false - export NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=false + export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_CENTOS_7_DIB=true" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_FEDORA_24_DIB=true" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB=false" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=false" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=false" fi function post_test_hook {{