From 1d00c0461098f230d45965f54f52d499b027b771 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dirk@dmllr.de>
Date: Mon, 17 Jul 2017 22:18:42 +0200
Subject: [PATCH] Add support for nodepool testing of openSUSE 42.3

Copy&paste of the relevant code parts of openSUSE 42.2 without
the dot/underscore, which we dropped in other places as well.

Change-Id: I08a663fd03c8545de09d650001ab250eaf40e427
---
 devstack/plugin.sh             | 32 ++++++++++++++++++++++++++++++++
 devstack/settings              |  1 +
 tools/check_devstack_plugin.sh | 10 ++++++++++
 3 files changed, 43 insertions(+)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index cbb1608d9..c471f4057 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -258,6 +258,11 @@ labels:
     min-ready: 1
     providers:
       - name: devstack
+  - name: opensuse-423
+    image: opensuse-423
+    min-ready: 1
+    providers:
+      - name: devstack
   - name: ubuntu-trusty
     image: ubuntu-trusty
     min-ready: 1
@@ -308,6 +313,13 @@ providers:
         private-key: $NODEPOOL_KEY
         config-drive: true
         key-name: $NODEPOOL_KEY_NAME
+      - name: opensuse-423
+        min-ram: 1024
+        name-filter: 'nodepool'
+        username: devuser
+        private-key: $NODEPOOL_KEY
+        config-drive: true
+        key-name: $NODEPOOL_KEY_NAME
       - name: ubuntu-trusty
         min-ram: 512
         name-filter: 'nodepool'
@@ -410,6 +422,26 @@ diskimages:
       $DIB_GLEAN_INSTALLTYPE
       $DIB_GLEAN_REPOLOCATION
       $DIB_GLEAN_REPOREF
+  - name: opensuse-423
+    pause: $NODEPOOL_PAUSE_OPENSUSE_423_DIB
+    rebuild-age: 86400
+    elements:
+      - opensuse-minimal
+      - vm
+      - simple-init
+      - devuser
+      - openssh-server
+      - nodepool-setup
+    release: 42.3
+    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-trusty
     pause: $NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB
     rebuild-age: 86400
diff --git a/devstack/settings b/devstack/settings
index 505b55adf..cbf03d972 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -10,6 +10,7 @@ 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_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}
 
diff --git a/tools/check_devstack_plugin.sh b/tools/check_devstack_plugin.sh
index 776f33a31..16204175d 100755
--- a/tools/check_devstack_plugin.sh
+++ b/tools/check_devstack_plugin.sh
@@ -12,6 +12,7 @@ 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_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}
 
@@ -85,6 +86,15 @@ if [ $NODEPOOL_PAUSE_OPENSUSE_42_2_DIB = 'false' ]; then
     sshintonode opensuse-42.2
 fi
 
+if [ $NODEPOOL_PAUSE_OPENSUSE_423_DIB = 'false' ]; then
+    # check that image built
+    waitforimage opensuse-423
+    # check image was bootable
+    waitfornode opensuse-423
+    # check ssh for root user
+    sshintonode opensuse-423
+fi
+
 if [ $NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB = 'false' ]; then
     # check that image built
     waitforimage ubuntu-trusty