Merge "Add opensuse 42.2 DIB testing"

This commit is contained in:
Jenkins 2017-04-06 15:36:32 +00:00 committed by Gerrit Code Review
commit e87e97a6be
4 changed files with 43 additions and 0 deletions

View File

@ -3,3 +3,6 @@ kpartx
debootstrap
yum-utils
zookeeperd
zypper
# workarond for https://bugs.launchpad.net/ubuntu/+source/zypper/+bug/1639428
gnupg2

View File

@ -251,6 +251,11 @@ labels:
min-ready: 1
providers:
- name: devstack
- name: opensuse-42.2
image: opensuse-42.2
min-ready: 1
providers:
- name: devstack
- name: ubuntu-precise
image: ubuntu-precise
min-ready: 1
@ -296,6 +301,12 @@ providers:
username: devuser
private-key: $NODEPOOL_KEY
config-drive: true
- name: opensuse-42.2
min-ram: 1024
name-filter: 'nodepool'
username: devuser
private-key: $NODEPOOL_KEY
config-drive: true
- name: ubuntu-precise
min-ram: 512
name-filter: 'nodepool'
@ -381,6 +392,26 @@ 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: ubuntu-precise
pause: $NODEPOOL_PAUSE_UBUNTU_PRECISE_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_OPENSUSE_42_2_DIB=${NODEPOOL_PAUSE_OPENSUSE_42_2_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_OPENSUSE_42_2_DIB=${NODEPOOL_PAUSE_OPENSUSE_42_2_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}
@ -62,6 +63,13 @@ if [ $NODEPOOL_PAUSE_FEDORA_25_DIB = 'false' ]; then
waitfornode fedora-25
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
fi
if [ $NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB = 'false' ]; then
# check that image built
waitforimage ubuntu-precise