openstack/project-config
Code Issues Proposed changes

Fix include logic for nodepool dsvm jobs

Browse Source 
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 <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2016-12-22 11:11:15 -05:00
parent f122112a7c
commit ebe5abbd69
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
jenkins/jobs/nodepool.yaml
View File

@ -95,17 +95,17 @@
export DEVSTACK_LOCAL_CONFIG+=$'\n'"LIBS_FROM_GIT=diskimage-builder,glean,shade" export DEVSTACK_LOCAL_CONFIG+=$'\n'"LIBS_FROM_GIT=diskimage-builder,glean,shade"
if [ "{images}" == "-redhat" ] ; then if [ "{images}" == "-redhat" ] ; then
export NODEPOOL_PAUSE_CENTOS_7_DIB=false export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_CENTOS_7_DIB=false"
export NODEPOOL_PAUSE_FEDORA_24_DIB=false export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_FEDORA_24_DIB=false"
export NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB=true export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB=true"
export NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=true export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=true"
export NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=true export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=true"
elif [ "{images}" == "-debian" ] ; then elif [ "{images}" == "-debian" ] ; then
export NODEPOOL_PAUSE_CENTOS_7_DIB=true export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_CENTOS_7_DIB=true"
export NODEPOOL_PAUSE_FEDORA_24_DIB=true export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_FEDORA_24_DIB=true"
export NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB=false export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB=false"
export NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=false export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=false"
export NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=false export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=false"
fi fi
function post_test_hook {{ function post_test_hook {{