Clean up old images for testing

Both fedora-25 and ubuntu-precise are nolonger tested. Remove dead
logic.

Change-Id: Ib54827bfea01cec39bd161a5a94fee350556102f
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2018-02-14 13:03:09 -05:00 committed by Ian Wienand
parent 41d2852824
commit 230c4ff792
3 changed files with 0 additions and 44 deletions

View File

@ -199,8 +199,6 @@ EOF
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
@ -212,9 +210,6 @@ EOF
if $NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB ; then
NODEPOOL_DEBIAN_JESSIE_MIN_READY=0
fi
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
@ -244,8 +239,6 @@ labels:
min-ready: $NODEPOOL_CENTOS_7_MIN_READY
- name: debian-jessie
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
@ -268,8 +261,6 @@ providers:
config-drive: true
- name: debian-jessie
config-drive: true
- name: fedora-25
config-drive: true
- name: fedora-26
config-drive: true
- name: ubuntu-trusty
@ -292,11 +283,6 @@ providers:
min-ram: 512
flavor-name: 'nodepool'
console-log: True
- name: fedora-25
diskimage: fedora-25
min-ram: 1024
flavor-name: 'nodepool'
console-log: True
- name: fedora-26
diskimage: fedora-26
min-ram: 1024
@ -365,26 +351,6 @@ diskimages:
$DIB_GLEAN_INSTALLTYPE
$DIB_GLEAN_REPOLOCATION
$DIB_GLEAN_REPOREF
- name: fedora-25
pause: $NODEPOOL_PAUSE_FEDORA_25_DIB
rebuild-age: 86400
elements:
- fedora-minimal
- vm
- simple-init
- devuser
- openssh-server
- nodepool-setup
release: 25
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: fedora-26
pause: $NODEPOOL_PAUSE_FEDORA_26_DIB
rebuild-age: 86400

View File

@ -8,9 +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_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:-true}
NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=${NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB:-true}
NODEPOOL_PAUSE_OPENSUSE_423_DIB=${NODEPOOL_PAUSE_OPENSUSE_423_DIB:-true}

View File

@ -24,7 +24,6 @@ else
fi
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:-True}
NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=${NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB:-True}
@ -66,13 +65,6 @@ if [ ${NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB,,} = 'false' ]; then
waitfornode debian-jessie
fi
if [ ${NODEPOOL_PAUSE_FEDORA_25_DIB,,} = 'false' ]; then
# check that image built
waitforimage fedora-25
# check image was bootable
waitfornode fedora-25
fi
if [ ${NODEPOOL_PAUSE_FEDORA_26_DIB,,} = 'false' ]; then
# check that image built
waitforimage fedora-26