Add support to test fedora-26

Fedora 26 is now the latest version, so lets start supporting it for
nodepool devstack testing.

  https://fedoraproject.org/wiki/Releases/26/Schedule

Change-Id: I9cde430a8cda53357851ab527446f6b32919907e
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2017-07-11 09:40:48 -04:00
parent 40bcd38fea
commit 1f175a4754
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
3 changed files with 43 additions and 1 deletions

View File

@ -197,10 +197,11 @@ EOF
DIB_DEBOOTSTRAP_EXTRA_ARGS="DIB_DEBOOTSTRAP_EXTRA_ARGS: '--no-check-gpg'"
fi
NODEPOOL_CENTOS_7_MIN_READY=1
NODEPOOL_DEBIAN_JESSIE_MIN_READY=1
# TODO(pabelanger): Remove fedora-25 after fedora-26 is online
NODEPOOL_FEDORA_25_MIN_READY=1
NODEPOOL_FEDORA_26_MIN_READY=1
NODEPOOL_UBUNTU_TRUSTY_MIN_READY=1
NODEPOOL_UBUNTU_XENIAL_MIN_READY=1
@ -213,6 +214,9 @@ EOF
if $NODEPOOL_PAUSE_FEDORA_25_DIB ; then
NODEPOOL_FEDORA_25_MIN_READY=0
fi
if $NODEPOOL_PAUSE_FEDORA_26_DIB ; then
NODEPOOL_FEDORA_26_MIN_READY=0
fi
if $NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB ; then
NODEPOOL_UBUNTU_TRUSTY_MIN_READY=0
fi
@ -238,6 +242,8 @@ labels:
min-ready: $NODEPOOL_DEBIAN_JESSIE_MIN_READY
- name: fedora-25
min-ready: $NODEPOOL_FEDORA_25_MIN_READY
- name: fedora-26
min-ready: $NODEPOOL_FEDORA_26_MIN_READY
- name: ubuntu-trusty
min-ready: $NODEPOOL_UBUNTU_TRUSTY_MIN_READY
- name: ubuntu-xenial
@ -258,6 +264,8 @@ providers:
config-drive: true
- name: fedora-25
config-drive: true
- name: fedora-26
config-drive: true
- name: ubuntu-trusty
config-drive: true
- name: ubuntu-xenial
@ -281,6 +289,11 @@ providers:
min-ram: 1024
flavor-name: 'nodepool'
console-log: True
- name: fedora-26
diskimage: fedora-26
min-ram: 1024
flavor-name: 'nodepool'
console-log: True
- name: ubuntu-trusty
diskimage: ubuntu-trusty
min-ram: 512
@ -358,6 +371,26 @@ diskimages:
$DIB_GLEAN_INSTALLTYPE
$DIB_GLEAN_REPOLOCATION
$DIB_GLEAN_REPOREF
- name: fedora-26
pause: $NODEPOOL_PAUSE_FEDORA_26_DIB
rebuild-age: 86400
elements:
- fedora-minimal
- vm
- simple-init
- devuser
- openssh-server
- nodepool-setup
release: 26
env-vars:
TMPDIR: $NODEPOOL_DIB_BASE_PATH/tmp
DIB_CHECKSUM: '1'
DIB_IMAGE_CACHE: $NODEPOOL_DIB_BASE_PATH/cache
DIB_DEV_USER_AUTHORIZED_KEYS: $NODEPOOL_PUBKEY
$DIB_GET_PIP
$DIB_GLEAN_INSTALLTYPE
$DIB_GLEAN_REPOLOCATION
$DIB_GLEAN_REPOREF
- name: ubuntu-trusty
pause: $NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB
rebuild-age: 86400

View File

@ -9,6 +9,7 @@ NODEPOOL_DIB_BASE_PATH=/opt/dib
NODEPOOL_PAUSE_CENTOS_7_DIB=${NODEPOOL_PAUSE_CENTOS_7_DIB:-true}
NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB=${NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB:-true}
NODEPOOL_PAUSE_FEDORA_25_DIB=${NODEPOOL_PAUSE_FEDORA_25_DIB:-true}
NODEPOOL_PAUSE_FEDORA_26_DIB=${NODEPOOL_PAUSE_FEDORA_26_DIB:-true}
NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB=${NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB:-true}
NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=${NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB:-false}
NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=${NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB:-true}

View File

@ -11,6 +11,7 @@ NODEPOOL="$NODEPOOL_INSTALL/bin/nodepool -c $NODEPOOL_CONFIG -s $NODEPOOL_SECURE
NODEPOOL_PAUSE_CENTOS_7_DIB=${NODEPOOL_PAUSE_CENTOS_7_DIB:-true}
NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB=${NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB:-true}
NODEPOOL_PAUSE_FEDORA_25_DIB=${NODEPOOL_PAUSE_FEDORA_25_DIB:-true}
NODEPOOL_PAUSE_FEDORA_26_DIB=${NODEPOOL_PAUSE_FEDORA_26_DIB:-true}
NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=${NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB:-false}
NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=${NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB:-true}
@ -61,6 +62,13 @@ if [ $NODEPOOL_PAUSE_FEDORA_25_DIB = 'false' ]; then
waitfornode fedora-25
fi
if [ $NODEPOOL_PAUSE_FEDORA_26_DIB = 'false' ]; then
# check that image built
waitforimage fedora-26
# check image was bootable
waitfornode fedora-26
fi
if [ $NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB = 'false' ]; then
# check that image built
waitforimage ubuntu-trusty