From 3cbbabfa4e56bce1ac645c277b323ba91b1b8d88 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Wed, 12 Jul 2017 08:13:47 -0400 Subject: [PATCH] Support fedora-26 for nodepool dsvm job Fedora 26 is now live, start testing as we plan on rolling this image in openstack-infra. Change-Id: Ieba5f69020a13681074f72cfca2955071801b63a Signed-off-by: Paul Belanger --- devstack/plugin.sh | 33 +++++++++++++++++++++++++++++++++ devstack/settings | 1 + tools/check_devstack_plugin.sh | 10 ++++++++++ 3 files changed, 44 insertions(+) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index cbb1608d9..02f1ed5dd 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -253,6 +253,11 @@ labels: 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 @@ -301,6 +306,13 @@ providers: private-key: $NODEPOOL_KEY config-drive: true key-name: $NODEPOOL_KEY_NAME + - name: fedora-26 + min-ram: 1024 + name-filter: 'nodepool' + username: devuser + private-key: $NODEPOOL_KEY + config-drive: true + key-name: $NODEPOOL_KEY_NAME - name: opensuse-42.2 min-ram: 1024 name-filter: 'nodepool' @@ -390,6 +402,27 @@ 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_DISTRIBUTION_MIRROR_FEDORA + $DIB_GET_PIP + $DIB_GLEAN_INSTALLTYPE + $DIB_GLEAN_REPOLOCATION + $DIB_GLEAN_REPOREF - name: opensuse-42.2 pause: $NODEPOOL_PAUSE_OPENSUSE_42_2_DIB rebuild-age: 86400 diff --git a/devstack/settings b/devstack/settings index 505b55adf..692a5de93 100644 --- a/devstack/settings +++ b/devstack/settings @@ -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_OPENSUSE_42_2_DIB=${NODEPOOL_PAUSE_OPENSUSE_42_2_DIB:-true} NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=${NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB:-false} NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=${NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB:-true} diff --git a/tools/check_devstack_plugin.sh b/tools/check_devstack_plugin.sh index 776f33a31..6806b4348 100755 --- a/tools/check_devstack_plugin.sh +++ b/tools/check_devstack_plugin.sh @@ -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_OPENSUSE_42_2_DIB=${NODEPOOL_PAUSE_OPENSUSE_42_2_DIB:-true} NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=${NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB:-false} NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=${NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB:-true} @@ -76,6 +77,15 @@ if [ $NODEPOOL_PAUSE_FEDORA_25_DIB = 'false' ]; then sshintonode 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 + # check ssh for root user + sshintonode fedora-26 +fi + if [ $NODEPOOL_PAUSE_OPENSUSE_42_2_DIB = 'false' ]; then # check that image built waitforimage opensuse-42.2