Add debian DIBs to nodepool-dsvm jobs
This job actually exists now, but is building ubuntu images. So, move that to dsvm-nodepool-ubuntu, then we can add DEBIAN_JESSIE_DIB support to the existing debian job. Change-Id: I6c1a84e9751c4eb4784dfebd769727e94b47f714 Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
parent
549c076798
commit
2e5435daf8
|
@ -112,20 +112,24 @@
|
||||||
|
|
||||||
# Start with all images disabled.
|
# Start with all images disabled.
|
||||||
export NODEPOOL_PAUSE_CENTOS_7_DIB=true
|
export NODEPOOL_PAUSE_CENTOS_7_DIB=true
|
||||||
|
export NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB=true
|
||||||
export NODEPOOL_PAUSE_FEDORA_25_DIB=true
|
export NODEPOOL_PAUSE_FEDORA_25_DIB=true
|
||||||
export NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB=true
|
export NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB=true
|
||||||
export NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=true
|
export NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=true
|
||||||
export NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=true
|
export NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=true
|
||||||
|
|
||||||
if [ "{images}" == "-redhat" ] ; then
|
if [ "{images}" == "-debian" ] ; then
|
||||||
|
export NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB=false
|
||||||
|
elif [ "{images}" == "-redhat" ] ; then
|
||||||
export NODEPOOL_PAUSE_CENTOS_7_DIB=false
|
export NODEPOOL_PAUSE_CENTOS_7_DIB=false
|
||||||
export NODEPOOL_PAUSE_FEDORA_25_DIB=false
|
export NODEPOOL_PAUSE_FEDORA_25_DIB=false
|
||||||
elif [ "{images}" == "-debian" ] ; then
|
elif [ "{images}" == "-ubuntu" ] ; then
|
||||||
export NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB=false
|
export NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB=false
|
||||||
export NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=false
|
export NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=false
|
||||||
export NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=false
|
export NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=false
|
||||||
fi
|
fi
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_CENTOS_7_DIB=$NODEPOOL_PAUSE_CENTOS_7_DIB"
|
export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_CENTOS_7_DIB=$NODEPOOL_PAUSE_CENTOS_7_DIB"
|
||||||
|
export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB=$NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB"
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_FEDORA_25_DIB=$NODEPOOL_PAUSE_FEDORA_25_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_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_TRUSTY_DIB=$NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB"
|
||||||
|
|
|
@ -4015,7 +4015,12 @@
|
||||||
images: '-redhat'
|
images: '-redhat'
|
||||||
suffix: '-nv'
|
suffix: '-nv'
|
||||||
branch-override: 'default'
|
branch-override: 'default'
|
||||||
|
- '{pipeline}-dsvm-nodepool{images}-src{suffix}':
|
||||||
|
pipeline: gate
|
||||||
|
node: ubuntu-xenial
|
||||||
|
images: '-ubuntu'
|
||||||
|
suffix: '-nv'
|
||||||
|
branch-override: 'default'
|
||||||
|
|
||||||
- project:
|
- project:
|
||||||
name: distil
|
name: distil
|
||||||
|
|
|
@ -4142,6 +4142,7 @@ projects:
|
||||||
check:
|
check:
|
||||||
- gate-dsvm-nodepool-debian-src-nv
|
- gate-dsvm-nodepool-debian-src-nv
|
||||||
- gate-dsvm-nodepool-redhat-src-nv
|
- gate-dsvm-nodepool-redhat-src-nv
|
||||||
|
- gate-dsvm-nodepool-ubuntu-src-nv
|
||||||
|
|
||||||
- name: openstack-infra/grafyaml
|
- name: openstack-infra/grafyaml
|
||||||
template:
|
template:
|
||||||
|
@ -9074,6 +9075,7 @@ projects:
|
||||||
- gate-dib-dsvm-functests-ubuntu-xenial-extras-nv
|
- gate-dib-dsvm-functests-ubuntu-xenial-extras-nv
|
||||||
- gate-dsvm-nodepool-debian-src-nv
|
- gate-dsvm-nodepool-debian-src-nv
|
||||||
- gate-dsvm-nodepool-redhat-src-nv
|
- gate-dsvm-nodepool-redhat-src-nv
|
||||||
|
- gate-dsvm-nodepool-ubuntu-src-nv
|
||||||
check-tripleo:
|
check-tripleo:
|
||||||
- gate-tripleo-ci-centos-7-ovb-nonha
|
- gate-tripleo-ci-centos-7-ovb-nonha
|
||||||
gate:
|
gate:
|
||||||
|
|
Loading…
Reference in New Issue