Merge "Update devstack test to Fedora 28"
This commit is contained in:
commit
f13c736f52
@ -85,7 +85,7 @@
|
||||
vars:
|
||||
devstack_localrc:
|
||||
NODEPOOL_PAUSE_CENTOS_7_DIB: false
|
||||
NODEPOOL_PAUSE_FEDORA_27_DIB: false
|
||||
NODEPOOL_PAUSE_FEDORA_28_DIB: false
|
||||
|
||||
- job:
|
||||
name: nodepool-functional-py35-suse-src
|
||||
|
@ -201,7 +201,7 @@ EOF
|
||||
|
||||
NODEPOOL_CENTOS_7_MIN_READY=1
|
||||
NODEPOOL_DEBIAN_STRETCH_MIN_READY=1
|
||||
NODEPOOL_FEDORA_27_MIN_READY=1
|
||||
NODEPOOL_FEDORA_28_MIN_READY=1
|
||||
NODEPOOL_UBUNTU_BIONIC_MIN_READY=1
|
||||
NODEPOOL_UBUNTU_TRUSTY_MIN_READY=1
|
||||
NODEPOOL_UBUNTU_XENIAL_MIN_READY=1
|
||||
@ -216,8 +216,8 @@ EOF
|
||||
if $NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB ; then
|
||||
NODEPOOL_DEBIAN_STRETCH_MIN_READY=0
|
||||
fi
|
||||
if $NODEPOOL_PAUSE_FEDORA_27_DIB ; then
|
||||
NODEPOOL_FEDORA_27_MIN_READY=0
|
||||
if $NODEPOOL_PAUSE_FEDORA_28_DIB ; then
|
||||
NODEPOOL_FEDORA_28_MIN_READY=0
|
||||
fi
|
||||
if $NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB ; then
|
||||
NODEPOOL_UBUNTU_BIONIC_MIN_READY=0
|
||||
@ -257,8 +257,8 @@ labels:
|
||||
min-ready: $NODEPOOL_CENTOS_7_MIN_READY
|
||||
- name: debian-stretch
|
||||
min-ready: $NODEPOOL_DEBIAN_STRETCH_MIN_READY
|
||||
- name: fedora-27
|
||||
min-ready: $NODEPOOL_FEDORA_27_MIN_READY
|
||||
- name: fedora-28
|
||||
min-ready: $NODEPOOL_FEDORA_28_MIN_READY
|
||||
- name: ubuntu-bionic
|
||||
min-ready: $NODEPOOL_UBUNTU_BIONIC_MIN_READY
|
||||
- name: ubuntu-trusty
|
||||
@ -287,7 +287,7 @@ providers:
|
||||
config-drive: true
|
||||
- name: debian-stretch
|
||||
config-drive: true
|
||||
- name: fedora-27
|
||||
- name: fedora-28
|
||||
config-drive: true
|
||||
- name: ubuntu-bionic
|
||||
config-drive: true
|
||||
@ -323,8 +323,8 @@ providers:
|
||||
key-name: $NODEPOOL_KEY_NAME
|
||||
instance-properties:
|
||||
nodepool_devstack: testing
|
||||
- name: fedora-27
|
||||
diskimage: fedora-27
|
||||
- name: fedora-28
|
||||
diskimage: fedora-28
|
||||
min-ram: 1024
|
||||
flavor-name: 'nodepool'
|
||||
console-log: True
|
||||
@ -438,8 +438,8 @@ diskimages:
|
||||
$DIB_GLEAN_INSTALLTYPE
|
||||
$DIB_GLEAN_REPOLOCATION
|
||||
$DIB_GLEAN_REPOREF
|
||||
- name: fedora-27
|
||||
pause: $NODEPOOL_PAUSE_FEDORA_27_DIB
|
||||
- name: fedora-28
|
||||
pause: $NODEPOOL_PAUSE_FEDORA_28_DIB
|
||||
rebuild-age: 86400
|
||||
elements:
|
||||
- fedora-minimal
|
||||
@ -449,7 +449,7 @@ diskimages:
|
||||
- devuser
|
||||
- openssh-server
|
||||
- nodepool-setup
|
||||
release: 27
|
||||
release: 28
|
||||
env-vars:
|
||||
TMPDIR: $NODEPOOL_DIB_BASE_PATH/tmp
|
||||
DIB_CHECKSUM: '1'
|
||||
|
@ -8,7 +8,7 @@ NODEPOOL_DIB_BASE_PATH=/opt/dib
|
||||
# change the defaults.
|
||||
NODEPOOL_PAUSE_CENTOS_7_DIB=${NODEPOOL_PAUSE_CENTOS_7_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_28_DIB=${NODEPOOL_PAUSE_FEDORA_28_DIB:-true}
|
||||
NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB=${NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB:-true}
|
||||
NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=${NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB:-true}
|
||||
NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=${NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB:-true}
|
||||
|
@ -21,7 +21,7 @@ else
|
||||
fi
|
||||
NODEPOOL_PAUSE_CENTOS_7_DIB=${NODEPOOL_PAUSE_CENTOS_7_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_28_DIB=${NODEPOOL_PAUSE_FEDORA_28_DIB:-True}
|
||||
NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB=${NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB:-True}
|
||||
NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=${NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB:-True}
|
||||
NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=${NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB:-True}
|
||||
@ -108,13 +108,13 @@ if [ ${NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB,,} = 'false' ]; then
|
||||
sshintonode debian-stretch
|
||||
fi
|
||||
|
||||
if [ ${NODEPOOL_PAUSE_FEDORA_27_DIB,,} = 'false' ]; then
|
||||
if [ ${NODEPOOL_PAUSE_FEDORA_28_DIB,,} = 'false' ]; then
|
||||
# check that image built
|
||||
waitforimage fedora-27
|
||||
waitforimage fedora-28
|
||||
# check image was bootable
|
||||
waitfornode fedora-27
|
||||
waitfornode fedora-28
|
||||
# check ssh for root user
|
||||
sshintonode fedora-27
|
||||
sshintonode fedora-28
|
||||
fi
|
||||
|
||||
if [ ${NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB,,} = 'false' ]; then
|
||||
|
Loading…
Reference in New Issue
Block a user