Remove debian-jessie from nodepool dsvm testing
Now that debian-stretch is working as expected, we can remove debian-jessie. Change-Id: If897757023772bb4549e40e7fcd048998175fb5b Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
parent
db87b73a50
commit
35d589296c
@ -119,7 +119,6 @@
|
|||||||
parent: nodepool-functional-py35-src-base
|
parent: nodepool-functional-py35-src-base
|
||||||
vars:
|
vars:
|
||||||
devstack_localrc:
|
devstack_localrc:
|
||||||
NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB: false
|
|
||||||
NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB: false
|
NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB: false
|
||||||
|
|
||||||
- project:
|
- project:
|
||||||
|
@ -207,7 +207,6 @@ EOF
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
NODEPOOL_CENTOS_7_MIN_READY=1
|
NODEPOOL_CENTOS_7_MIN_READY=1
|
||||||
NODEPOOL_DEBIAN_JESSIE_MIN_READY=1
|
|
||||||
NODEPOOL_DEBIAN_STRETCH_MIN_READY=1
|
NODEPOOL_DEBIAN_STRETCH_MIN_READY=1
|
||||||
NODEPOOL_FEDORA_27_MIN_READY=1
|
NODEPOOL_FEDORA_27_MIN_READY=1
|
||||||
NODEPOOL_UBUNTU_BIONIC_MIN_READY=1
|
NODEPOOL_UBUNTU_BIONIC_MIN_READY=1
|
||||||
@ -220,9 +219,6 @@ EOF
|
|||||||
if $NODEPOOL_PAUSE_CENTOS_7_DIB ; then
|
if $NODEPOOL_PAUSE_CENTOS_7_DIB ; then
|
||||||
NODEPOOL_CENTOS_7_MIN_READY=0
|
NODEPOOL_CENTOS_7_MIN_READY=0
|
||||||
fi
|
fi
|
||||||
if $NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB ; then
|
|
||||||
NODEPOOL_DEBIAN_JESSIE_MIN_READY=0
|
|
||||||
fi
|
|
||||||
if $NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB ; then
|
if $NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB ; then
|
||||||
NODEPOOL_DEBIAN_STRETCH_MIN_READY=0
|
NODEPOOL_DEBIAN_STRETCH_MIN_READY=0
|
||||||
fi
|
fi
|
||||||
@ -262,8 +258,6 @@ zookeeper-servers:
|
|||||||
labels:
|
labels:
|
||||||
- name: centos-7
|
- name: centos-7
|
||||||
min-ready: $NODEPOOL_CENTOS_7_MIN_READY
|
min-ready: $NODEPOOL_CENTOS_7_MIN_READY
|
||||||
- name: debian-jessie
|
|
||||||
min-ready: $NODEPOOL_DEBIAN_JESSIE_MIN_READY
|
|
||||||
- name: debian-stretch
|
- name: debian-stretch
|
||||||
min-ready: $NODEPOOL_DEBIAN_STRETCH_MIN_READY
|
min-ready: $NODEPOOL_DEBIAN_STRETCH_MIN_READY
|
||||||
- name: fedora-27
|
- name: fedora-27
|
||||||
@ -292,8 +286,6 @@ providers:
|
|||||||
diskimages:
|
diskimages:
|
||||||
- name: centos-7
|
- name: centos-7
|
||||||
config-drive: true
|
config-drive: true
|
||||||
- name: debian-jessie
|
|
||||||
config-drive: true
|
|
||||||
- name: debian-stretch
|
- name: debian-stretch
|
||||||
config-drive: true
|
config-drive: true
|
||||||
- name: fedora-27
|
- name: fedora-27
|
||||||
@ -320,12 +312,6 @@ providers:
|
|||||||
flavor-name: 'nodepool'
|
flavor-name: 'nodepool'
|
||||||
console-log: True
|
console-log: True
|
||||||
key-name: $NODEPOOL_KEY_NAME
|
key-name: $NODEPOOL_KEY_NAME
|
||||||
- name: debian-jessie
|
|
||||||
diskimage: debian-jessie
|
|
||||||
min-ram: 512
|
|
||||||
flavor-name: 'nodepool'
|
|
||||||
console-log: True
|
|
||||||
key-name: $NODEPOOL_KEY_NAME
|
|
||||||
- name: debian-stretch
|
- name: debian-stretch
|
||||||
diskimage: debian-stretch
|
diskimage: debian-stretch
|
||||||
min-ram: 512
|
min-ram: 512
|
||||||
@ -398,33 +384,6 @@ diskimages:
|
|||||||
$DIB_GLEAN_INSTALLTYPE
|
$DIB_GLEAN_INSTALLTYPE
|
||||||
$DIB_GLEAN_REPOLOCATION
|
$DIB_GLEAN_REPOLOCATION
|
||||||
$DIB_GLEAN_REPOREF
|
$DIB_GLEAN_REPOREF
|
||||||
- name: debian-jessie
|
|
||||||
pause: $NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB
|
|
||||||
rebuild-age: 86400
|
|
||||||
elements:
|
|
||||||
- debian-minimal
|
|
||||||
- vm
|
|
||||||
- simple-init
|
|
||||||
- growroot
|
|
||||||
- devuser
|
|
||||||
- openssh-server
|
|
||||||
- nodepool-setup
|
|
||||||
release: jessie
|
|
||||||
env-vars:
|
|
||||||
TMPDIR: $NODEPOOL_DIB_BASE_PATH/tmp
|
|
||||||
DIB_CHECKSUM: '1'
|
|
||||||
DIB_SHOW_IMAGE_USAGE: '1'
|
|
||||||
DIB_IMAGE_CACHE: $NODEPOOL_DIB_BASE_PATH/cache
|
|
||||||
DIB_APT_LOCAL_CACHE: '0'
|
|
||||||
DIB_DISABLE_APT_CLEANUP: '1'
|
|
||||||
DIB_DEV_USER_AUTHORIZED_KEYS: $NODEPOOL_PUBKEY
|
|
||||||
DIB_DEBIAN_COMPONENTS: 'main'
|
|
||||||
$DIB_DISTRIBUTION_MIRROR_DEBIAN
|
|
||||||
$DIB_DEBOOTSTRAP_EXTRA_ARGS
|
|
||||||
$DIB_GET_PIP
|
|
||||||
$DIB_GLEAN_INSTALLTYPE
|
|
||||||
$DIB_GLEAN_REPOLOCATION
|
|
||||||
$DIB_GLEAN_REPOREF
|
|
||||||
- name: debian-stretch
|
- name: debian-stretch
|
||||||
pause: $NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB
|
pause: $NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB
|
||||||
rebuild-age: 86400
|
rebuild-age: 86400
|
||||||
|
@ -7,7 +7,6 @@ NODEPOOL_DIB_BASE_PATH=/opt/dib
|
|||||||
# NOTE(pabelanger): Be sure to also update tools/check_devstack_plugin.sh if you
|
# NOTE(pabelanger): Be sure to also update tools/check_devstack_plugin.sh if you
|
||||||
# change the defaults.
|
# change the defaults.
|
||||||
NODEPOOL_PAUSE_CENTOS_7_DIB=${NODEPOOL_PAUSE_CENTOS_7_DIB:-true}
|
NODEPOOL_PAUSE_CENTOS_7_DIB=${NODEPOOL_PAUSE_CENTOS_7_DIB:-true}
|
||||||
NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB=${NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB:-true}
|
|
||||||
NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB=${NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB:-true}
|
NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB=${NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB:-true}
|
||||||
NODEPOOL_PAUSE_FEDORA_27_DIB=${NODEPOOL_PAUSE_FEDORA_27_DIB:-true}
|
NODEPOOL_PAUSE_FEDORA_27_DIB=${NODEPOOL_PAUSE_FEDORA_27_DIB:-true}
|
||||||
NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB=${NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB:-true}
|
NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB=${NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB:-true}
|
||||||
|
@ -20,7 +20,6 @@ else
|
|||||||
source /opt/stack/devstack/stackrc
|
source /opt/stack/devstack/stackrc
|
||||||
fi
|
fi
|
||||||
NODEPOOL_PAUSE_CENTOS_7_DIB=${NODEPOOL_PAUSE_CENTOS_7_DIB:-True}
|
NODEPOOL_PAUSE_CENTOS_7_DIB=${NODEPOOL_PAUSE_CENTOS_7_DIB:-True}
|
||||||
NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB=${NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB:-True}
|
|
||||||
NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB=${NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB:-True}
|
NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB=${NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB:-True}
|
||||||
NODEPOOL_PAUSE_FEDORA_27_DIB=${NODEPOOL_PAUSE_FEDORA_27_DIB:-True}
|
NODEPOOL_PAUSE_FEDORA_27_DIB=${NODEPOOL_PAUSE_FEDORA_27_DIB:-True}
|
||||||
NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB=${NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB:-True}
|
NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB=${NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB:-True}
|
||||||
@ -90,15 +89,6 @@ if [ ${NODEPOOL_PAUSE_CENTOS_7_DIB,,} = 'false' ]; then
|
|||||||
sshintonode centos-7
|
sshintonode centos-7
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ${NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB,,} = 'false' ]; then
|
|
||||||
# check that image built
|
|
||||||
waitforimage debian-jessie
|
|
||||||
# check image was bootable
|
|
||||||
waitfornode debian-jessie
|
|
||||||
# check ssh for root user
|
|
||||||
sshintonode debian-jessie
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ${NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB,,} = 'false' ]; then
|
if [ ${NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB,,} = 'false' ]; then
|
||||||
# check that image built
|
# check that image built
|
||||||
waitforimage debian-stretch
|
waitforimage debian-stretch
|
||||||
|
Loading…
x
Reference in New Issue
Block a user