Remove opensuse-42.2 and fedora-25 from nodepool dsvm jobs

We no longer run this DIBs in openstack-infra, remove them.

Change-Id: Ie1e127ec721e31bb0cc39e8991ef2a648ec77230
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2017-09-07 12:18:15 -04:00
parent 26059d9539
commit 5cca1fb28d
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
3 changed files with 0 additions and 87 deletions

View File

@ -248,21 +248,11 @@ labels:
min-ready: 1
providers:
- name: devstack
- name: fedora-25
image: fedora-25
min-ready: 1
providers:
- name: devstack
- name: fedora-26
image: fedora-26
min-ready: 1
providers:
- name: devstack
- name: opensuse-42.2
image: opensuse-42.2
min-ready: 1
providers:
- name: devstack
- name: opensuse-423
image: opensuse-423
min-ready: 1
@ -304,13 +294,6 @@ providers:
private-key: $NODEPOOL_KEY
config-drive: true
key-name: $NODEPOOL_KEY_NAME
- name: fedora-25
min-ram: 1024
name-filter: 'nodepool'
username: devuser
private-key: $NODEPOOL_KEY
config-drive: true
key-name: $NODEPOOL_KEY_NAME
- name: fedora-26
min-ram: 1024
name-filter: 'nodepool'
@ -318,13 +301,6 @@ providers:
private-key: $NODEPOOL_KEY
config-drive: true
key-name: $NODEPOOL_KEY_NAME
- name: opensuse-42.2
min-ram: 1024
name-filter: 'nodepool'
username: devuser
private-key: $NODEPOOL_KEY
config-drive: true
key-name: $NODEPOOL_KEY_NAME
- name: opensuse-423
min-ram: 1024
name-filter: 'nodepool'
@ -393,27 +369,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_DISTRIBUTION_MIRROR_FEDORA
$DIB_GET_PIP
$DIB_GLEAN_INSTALLTYPE
$DIB_GLEAN_REPOLOCATION
$DIB_GLEAN_REPOREF
- name: fedora-26
pause: $NODEPOOL_PAUSE_FEDORA_26_DIB
rebuild-age: 86400
@ -435,26 +390,6 @@ diskimages:
$DIB_GLEAN_INSTALLTYPE
$DIB_GLEAN_REPOLOCATION
$DIB_GLEAN_REPOREF
- name: opensuse-42.2
pause: $NODEPOOL_PAUSE_OPENSUSE_42_2_DIB
rebuild-age: 86400
elements:
- opensuse-minimal
- vm
- simple-init
- devuser
- openssh-server
- nodepool-setup
release: 42.2
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: opensuse-423
pause: $NODEPOOL_PAUSE_OPENSUSE_423_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_OPENSUSE_42_2_DIB=${NODEPOOL_PAUSE_OPENSUSE_42_2_DIB:-true}
NODEPOOL_PAUSE_OPENSUSE_423_DIB=${NODEPOOL_PAUSE_OPENSUSE_423_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

@ -10,9 +10,7 @@ NODEPOOL="$NODEPOOL_INSTALL/bin/nodepool -c $NODEPOOL_CONFIG -s $NODEPOOL_SECURE
# 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_OPENSUSE_42_2_DIB=${NODEPOOL_PAUSE_OPENSUSE_42_2_DIB:-true}
NODEPOOL_PAUSE_OPENSUSE_423_DIB=${NODEPOOL_PAUSE_OPENSUSE_423_DIB:-true}
NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=${NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB:-false}
NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=${NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB:-true}
@ -69,15 +67,6 @@ if [ $NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB = 'false' ]; then
sshintonode 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
# check ssh for root user
sshintonode fedora-25
fi
if [ $NODEPOOL_PAUSE_FEDORA_26_DIB = 'false' ]; then
# check that image built
waitforimage fedora-26
@ -87,15 +76,6 @@ if [ $NODEPOOL_PAUSE_FEDORA_26_DIB = 'false' ]; then
sshintonode fedora-26
fi
if [ $NODEPOOL_PAUSE_OPENSUSE_42_2_DIB = 'false' ]; then
# check that image built
waitforimage opensuse-42.2
# check image was bootable
waitfornode opensuse-42.2
# check ssh for root user
sshintonode opensuse-42.2
fi
if [ $NODEPOOL_PAUSE_OPENSUSE_423_DIB = 'false' ]; then
# check that image built
waitforimage opensuse-423