diff --git a/.zuul.yaml b/.zuul.yaml index df08854f4..5f5420f64 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -94,6 +94,7 @@ vars: devstack_localrc: NODEPOOL_PAUSE_OPENSUSE_423_DIB: false + NODEPOOL_PAUSE_OPENSUSE_150_DIB: false NODEPOOL_PAUSE_OPENSUSE_TUMBLEWEED_DIB: false - job: diff --git a/devstack/plugin.sh b/devstack/plugin.sh index bd330bb57..d2e3da64c 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -213,6 +213,7 @@ EOF NODEPOOL_UBUNTU_TRUSTY_MIN_READY=1 NODEPOOL_UBUNTU_XENIAL_MIN_READY=1 NODEPOOL_OPENSUSE_423_MIN_READY=1 + NODEPOOL_OPENSUSE_150_MIN_READY=1 NODEPOOL_OPENSUSE_TUMBLEWEED_MIN_READY=1 NODEPOOL_GENTOO_17_0_SYSTEMD_MIN_READY=1 @@ -237,6 +238,9 @@ EOF if $NODEPOOL_PAUSE_OPENSUSE_423_DIB ; then NODEPOOL_OPENSUSE_423_MIN_READY=0 fi + if $NODEPOOL_PAUSE_OPENSUSE_150_DIB ; then + NODEPOOL_OPENSUSE_150_MIN_READY=0 + fi if $NODEPOOL_PAUSE_OPENSUSE_TUMBLEWEED_DIB ; then NODEPOOL_OPENSUSE_TUMBLEWEED_MIN_READY=0 fi @@ -270,6 +274,8 @@ labels: min-ready: $NODEPOOL_UBUNTU_XENIAL_MIN_READY - name: opensuse-423 min-ready: $NODEPOOL_OPENSUSE_423_MIN_READY + - name: opensuse-150 + min-ready: $NODEPOOL_OPENSUSE_150_MIN_READY - name: opensuse-tumbleweed min-ready: $NODEPOOL_OPENSUSE_TUMBLEWEED_MIN_READY - name: gentoo-17-0-systemd @@ -298,6 +304,8 @@ providers: config-drive: true - name: opensuse-423 config-drive: true + - name: opensuse-150 + config-drive: true - name: opensuse-tumbleweed config-drive: true - name: gentoo-17-0-systemd @@ -348,6 +356,12 @@ providers: flavor-name: 'nodepool' console-log: True key-name: $NODEPOOL_KEY_NAME + - name: opensuse-150 + diskimage: opensuse-150 + min-ram: 512 + flavor-name: 'nodepool' + console-log: True + key-name: $NODEPOOL_KEY_NAME - name: opensuse-tumbleweed diskimage: opensuse-tumbleweed min-ram: 512 @@ -536,6 +550,28 @@ diskimages: $DIB_GLEAN_INSTALLTYPE $DIB_GLEAN_REPOLOCATION $DIB_GLEAN_REPOREF + - name: opensuse-150 + pause: $NODEPOOL_PAUSE_OPENSUSE_150_DIB + rebuild-age: 86400 + elements: + - opensuse-minimal + - vm + - simple-init + - growroot + - devuser + - openssh-server + - nodepool-setup + release: '15.0' + env-vars: + TMPDIR: $NODEPOOL_DIB_BASE_PATH/tmp + DIB_CHECKSUM: '1' + DIB_SHOW_IMAGE_USAGE: '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-tumbleweed pause: $NODEPOOL_PAUSE_OPENSUSE_TUMBLEWEED_DIB rebuild-age: 86400 diff --git a/devstack/settings b/devstack/settings index 63af13a27..485d4523c 100644 --- a/devstack/settings +++ b/devstack/settings @@ -13,6 +13,7 @@ NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB=${NODEPOOL_PAUSE_UBUNTU_BIONIC_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} +NODEPOOL_PAUSE_OPENSUSE_150_DIB=${NODEPOOL_PAUSE_OPENSUSE_150_DIB:-true} NODEPOOL_PAUSE_OPENSUSE_TUMBLEWEED_DIB=${NODEPOOL_PAUSE_OPENSUSE_TUMBLEWEED_DIB:-true} NODEPOOL_PAUSE_GENTOO_17_0_SYSTEMD_DIB=${NODEPOOL_PAUSE_GENTOO_17_0_SYSTEMD_DIB:-true} diff --git a/tools/check_devstack_plugin.sh b/tools/check_devstack_plugin.sh index 618bc211b..14a97b76d 100755 --- a/tools/check_devstack_plugin.sh +++ b/tools/check_devstack_plugin.sh @@ -26,6 +26,7 @@ NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB=${NODEPOOL_PAUSE_UBUNTU_BIONIC_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} +NODEPOOL_PAUSE_OPENSUSE_150_DIB=${NODEPOOL_PAUSE_OPENSUSE_150_DIB:-True} NODEPOOL_PAUSE_OPENSUSE_TUMBLEWEED_DIB=${NODEPOOL_PAUSE_OPENSUSE_TUMBLEWEED_DIB:-True} NODEPOOL_PAUSE_GENTOO_17_0_SYSTEMD_DIB=${NODEPOOL_PAUSE_GENTOO_17_0_SYSTEMD_DIB:-True} @@ -142,6 +143,14 @@ if [ ${NODEPOOL_PAUSE_OPENSUSE_423_DIB,,} = 'false' ]; then # check ssh for root user sshintonode opensuse-423 fi +if [ ${NODEPOOL_PAUSE_OPENSUSE_150_DIB,,} = 'false' ]; then + # check that image built + waitforimage opensuse-150 + # check image was bootable + waitfornode opensuse-150 + # check ssh for root user + sshintonode opensuse-150 +fi if [ ${NODEPOOL_PAUSE_OPENSUSE_TUMBLEWEED_DIB,,} = 'false' ]; then # check that image built waitforimage opensuse-tumbleweed