From 125d562e2dbfab9dc753d11d413477a4c80a3285 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Thu, 22 Dec 2016 13:28:49 -0500 Subject: [PATCH] Remove dsvm nodepool job part 2 We also need to export our vars into devstack for the post_test_hook. Change-Id: I418f918771f8fa9a7d179af3cca71838c2860c38 Signed-off-by: Paul Belanger --- jenkins/jobs/nodepool.yaml | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/jenkins/jobs/nodepool.yaml b/jenkins/jobs/nodepool.yaml index 884e25c053..07ce2011e4 100644 --- a/jenkins/jobs/nodepool.yaml +++ b/jenkins/jobs/nodepool.yaml @@ -95,17 +95,27 @@ export DEVSTACK_LOCAL_CONFIG+=$'\n'"LIBS_FROM_GIT=diskimage-builder,glean,shade" if [ "{images}" == "-redhat" ] ; then - 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" + NODEPOOL_PAUSE_CENTOS_7_DIB=false + NODEPOOL_PAUSE_FEDORA_24_DIB=false + NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB=true + NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=true + NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=true + export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_CENTOS_7_DIB=$NODEPOOL_PAUSE_CENTOS_7_DIB" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_FEDORA_24_DIB=$NODEPOOL_PAUSE_FEDORA_24_DIB" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB=$NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=$NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=$NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB" elif [ "{images}" == "-debian" ] ; then - 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" + NODEPOOL_PAUSE_CENTOS_7_DIB=true + NODEPOOL_PAUSE_FEDORA_24_DIB=true + NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB=false + NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=false + NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=false + export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_CENTOS_7_DIB=$NODEPOOL_PAUSE_CENTOS_7_DIB" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_FEDORA_24_DIB=$NODEPOOL_PAUSE_FEDORA_24_DIB" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB=$NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=$NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=$NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB" fi function post_test_hook {{