Clean up {pipeline}-dsvm-nodepool{images}-src{suffix} job
This is just an noop to reduce duplicate code and making it easier to read. Change-Id: I1df93d74b5d5dfa4ac2db42a54f5a76db18e50c7 Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
parent
72713cb991
commit
549c076798
|
@ -110,29 +110,26 @@
|
|||
export DEVSTACK_LOCAL_CONFIG="enable_plugin nodepool git://git.openstack.org/openstack-infra/nodepool"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"LIBS_FROM_GIT=diskimage-builder,glean,shade"
|
||||
|
||||
# Start with all images disabled.
|
||||
export NODEPOOL_PAUSE_CENTOS_7_DIB=true
|
||||
export NODEPOOL_PAUSE_FEDORA_25_DIB=true
|
||||
export NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB=true
|
||||
export NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=true
|
||||
export NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=true
|
||||
|
||||
if [ "{images}" == "-redhat" ] ; then
|
||||
export NODEPOOL_PAUSE_CENTOS_7_DIB=false
|
||||
export NODEPOOL_PAUSE_FEDORA_25_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=$NODEPOOL_PAUSE_CENTOS_7_DIB"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_FEDORA_25_DIB=$NODEPOOL_PAUSE_FEDORA_25_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 NODEPOOL_PAUSE_CENTOS_7_DIB=true
|
||||
export NODEPOOL_PAUSE_FEDORA_25_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=$NODEPOOL_PAUSE_CENTOS_7_DIB"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_FEDORA_25_DIB=$NODEPOOL_PAUSE_FEDORA_25_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
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_CENTOS_7_DIB=$NODEPOOL_PAUSE_CENTOS_7_DIB"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_FEDORA_25_DIB=$NODEPOOL_PAUSE_FEDORA_25_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"
|
||||
|
||||
function post_test_hook {{
|
||||
/opt/stack/new/nodepool/tools/check_devstack_plugin.sh
|
||||
|
|
Loading…
Reference in New Issue