Move to fedora-25 for devstack testing
Now that we have fedora 25 running in openstack-infra, update nodepool dsvm job to start using it. Change-Id: I3cc467a2d08486458b3f625f94ba969532f6cd04 Depends-On: Ie3529321a51b5b38ba3797a167d3deb855fb50b6 Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
parent
cef683bd01
commit
ba1940b77e
|
@ -204,8 +204,8 @@ labels:
|
|||
min-ready: 1
|
||||
providers:
|
||||
- name: devstack
|
||||
- name: fedora-24
|
||||
image: fedora-24
|
||||
- name: fedora-25
|
||||
image: fedora-25
|
||||
min-ready: 1
|
||||
providers:
|
||||
- name: devstack
|
||||
|
@ -242,7 +242,7 @@ providers:
|
|||
username: devuser
|
||||
private-key: $NODEPOOL_KEY
|
||||
config-drive: true
|
||||
- name: fedora-24
|
||||
- name: fedora-25
|
||||
min-ram: 1024
|
||||
name-filter: 'nodepool'
|
||||
username: devuser
|
||||
|
@ -287,8 +287,8 @@ diskimages:
|
|||
$DIB_GLEAN_INSTALLTYPE
|
||||
$DIB_GLEAN_REPOLOCATION
|
||||
$DIB_GLEAN_REPOREF
|
||||
- name: fedora-24
|
||||
pause: $NODEPOOL_PAUSE_FEDORA_24_DIB
|
||||
- name: fedora-25
|
||||
pause: $NODEPOOL_PAUSE_FEDORA_25_DIB
|
||||
rebuild-age: 86400
|
||||
elements:
|
||||
- fedora-minimal
|
||||
|
@ -297,7 +297,7 @@ diskimages:
|
|||
- devuser
|
||||
- openssh-server
|
||||
- nodepool-setup
|
||||
release: 24
|
||||
release: 25
|
||||
env-vars:
|
||||
TMPDIR: $NODEPOOL_DIB_BASE_PATH/tmp
|
||||
DIB_CHECKSUM: '1'
|
||||
|
|
|
@ -9,7 +9,7 @@ NODEPOOL="$NODEPOOL_INSTALL/bin/nodepool -c $NODEPOOL_CONFIG -s $NODEPOOL_SECURE
|
|||
# NOTE(pabelanger): Be sure to also update devstack/settings if you change the
|
||||
# defaults.
|
||||
NODEPOOL_PAUSE_CENTOS_7_DIB=${NODEPOOL_PAUSE_CENTOS_7_DIB:-true}
|
||||
NODEPOOL_PAUSE_FEDORA_24_DIB=${NODEPOOL_PAUSE_FEDORA_24_DIB:-true}
|
||||
NODEPOOL_PAUSE_FEDORA_25_DIB=${NODEPOOL_PAUSE_FEDORA_25_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}
|
||||
|
@ -47,11 +47,11 @@ if [ $NODEPOOL_PAUSE_CENTOS_7_DIB = 'false' ]; then
|
|||
waitfornode centos-7
|
||||
fi
|
||||
|
||||
if [ $NODEPOOL_PAUSE_FEDORA_24_DIB = 'false' ]; then
|
||||
if [ $NODEPOOL_PAUSE_FEDORA_25_DIB = 'false' ]; then
|
||||
# check that image built
|
||||
waitforimage fedora-24
|
||||
waitforimage fedora-25
|
||||
# check image was bootable
|
||||
waitfornode fedora-24
|
||||
waitfornode fedora-25
|
||||
fi
|
||||
|
||||
if [ $NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB = 'false' ]; then
|
||||
|
|
Loading…
Reference in New Issue