From 3088534dc138dfed2c371e2fd39f887836317508 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Fri, 30 Mar 2018 11:12:14 -0400
Subject: [PATCH] Add debian-stretch to nodepool-functional-py35-debian-src

Increase our test coverage for debian-stretch, as this is the latesst
stable version of debian.

Change-Id: I05cbfe9735eb0b3900203fbd423f68483b1cbf5d
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 .zuul.yaml                     |  4 ++++
 devstack/plugin.sh             | 37 ++++++++++++++++++++++++++++++++++
 devstack/settings              |  1 +
 tools/check_devstack_plugin.sh | 10 +++++++++
 4 files changed, 52 insertions(+)

diff --git a/.zuul.yaml b/.zuul.yaml
index 0ddb99db8..cd5064337 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -120,6 +120,7 @@
     vars:
       devstack_localrc:
         NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB: false
+        NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB: false
 
 - project:
     check:
@@ -147,3 +148,6 @@
       jobs:
         - publish-zuul-docs
         - publish-openstack-sphinx-docs-infra-python3
+    experimental:
+      jobs:
+        - nodepool-functional-py35-debian-src
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 65b3ccc9b..442cd5b0d 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -207,6 +207,7 @@ EOF
 
     NODEPOOL_CENTOS_7_MIN_READY=1
     NODEPOOL_DEBIAN_JESSIE_MIN_READY=1
+    NODEPOOL_DEBIAN_STRETCH_MIN_READY=1
     NODEPOOL_FEDORA_27_MIN_READY=1
     NODEPOOL_UBUNTU_BIONIC_MIN_READY=1
     NODEPOOL_UBUNTU_TRUSTY_MIN_READY=1
@@ -221,6 +222,9 @@ EOF
     if $NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB ; then
        NODEPOOL_DEBIAN_JESSIE_MIN_READY=0
     fi
+    if $NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB ; then
+       NODEPOOL_DEBIAN_STRETCH_MIN_READY=0
+    fi
     if $NODEPOOL_PAUSE_FEDORA_27_DIB ; then
        NODEPOOL_FEDORA_27_MIN_READY=0
     fi
@@ -259,6 +263,8 @@ labels:
     min-ready: $NODEPOOL_CENTOS_7_MIN_READY
   - name: debian-jessie
     min-ready: $NODEPOOL_DEBIAN_JESSIE_MIN_READY
+  - name: debian-stretch
+    min-ready: $NODEPOOL_DEBIAN_STRETCH_MIN_READY
   - name: fedora-27
     min-ready: $NODEPOOL_FEDORA_27_MIN_READY
   - name: ubuntu-bionic
@@ -287,6 +293,8 @@ providers:
         config-drive: true
       - name: debian-jessie
         config-drive: true
+      - name: debian-stretch
+        config-drive: true
       - name: fedora-27
         config-drive: true
       - name: ubuntu-bionic
@@ -317,6 +325,12 @@ providers:
             flavor-name: 'nodepool'
             console-log: True
             key-name: $NODEPOOL_KEY_NAME
+          - name: debian-stretch
+            diskimage: debian-stretch
+            min-ram: 512
+            flavor-name: 'nodepool'
+            console-log: True
+            key-name: $NODEPOOL_KEY_NAME
           - name: fedora-27
             diskimage: fedora-27
             min-ram: 1024
@@ -406,6 +420,29 @@ diskimages:
       $DIB_GLEAN_INSTALLTYPE
       $DIB_GLEAN_REPOLOCATION
       $DIB_GLEAN_REPOREF
+  - name: debian-stretch
+    pause: $NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB
+    rebuild-age: 86400
+    elements:
+      - debian-minimal
+      - vm
+      - simple-init
+      - devuser
+      - openssh-server
+      - nodepool-setup
+    release: stretch
+    env-vars:
+      TMPDIR: $NODEPOOL_DIB_BASE_PATH/tmp
+      DIB_CHECKSUM: '1'
+      DIB_IMAGE_CACHE: $NODEPOOL_DIB_BASE_PATH/cache
+      DIB_APT_LOCAL_CACHE: '0'
+      DIB_DISABLE_APT_CLEANUP: '1'
+      DIB_DEV_USER_AUTHORIZED_KEYS: $NODEPOOL_PUBKEY
+      DIB_DEBIAN_COMPONENTS: 'main'
+      $DIB_GET_PIP
+      $DIB_GLEAN_INSTALLTYPE
+      $DIB_GLEAN_REPOLOCATION
+      $DIB_GLEAN_REPOREF
   - name: fedora-27
     pause: $NODEPOOL_PAUSE_FEDORA_27_DIB
     rebuild-age: 86400
diff --git a/devstack/settings b/devstack/settings
index eb7202aa8..2c7898ee0 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -8,6 +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_DEBIAN_STRETCH_DIB=${NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB:-true}
 NODEPOOL_PAUSE_FEDORA_27_DIB=${NODEPOOL_PAUSE_FEDORA_27_DIB:-true}
 NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB=${NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB:-true}
 NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=${NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB:-true}
diff --git a/tools/check_devstack_plugin.sh b/tools/check_devstack_plugin.sh
index ade8485a1..b97aa58e0 100755
--- a/tools/check_devstack_plugin.sh
+++ b/tools/check_devstack_plugin.sh
@@ -17,6 +17,7 @@ else
 fi
 NODEPOOL_PAUSE_CENTOS_7_DIB=${NODEPOOL_PAUSE_CENTOS_7_DIB:-True}
 NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB=${NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB:-True}
+NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB=${NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB:-True}
 NODEPOOL_PAUSE_FEDORA_27_DIB=${NODEPOOL_PAUSE_FEDORA_27_DIB:-True}
 NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB=${NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB:-True}
 NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=${NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB:-True}
@@ -73,6 +74,15 @@ if [ ${NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB,,} = 'false' ]; then
     sshintonode debian-jessie
 fi
 
+if [ ${NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB,,} = 'false' ]; then
+    # check that image built
+    waitforimage debian-stretch
+    # check image was bootable
+    waitfornode debian-stretch
+    # check ssh for root user
+    sshintonode debian-stretch
+fi
+
 if [ ${NODEPOOL_PAUSE_FEDORA_27_DIB,,} = 'false' ]; then
     # check that image built
     waitforimage fedora-27