From 35d589296cbe9394b03935c21a68bf362124fd26 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Fri, 4 May 2018 10:25:43 -0400
Subject: [PATCH] Remove debian-jessie from nodepool dsvm testing

Now that debian-stretch is working as expected, we can remove
debian-jessie.

Change-Id: If897757023772bb4549e40e7fcd048998175fb5b
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 .zuul.yaml                     |  1 -
 devstack/plugin.sh             | 41 ----------------------------------
 devstack/settings              |  1 -
 tools/check_devstack_plugin.sh | 10 ---------
 4 files changed, 53 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index cd5064337..17dc1922a 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -119,7 +119,6 @@
     parent: nodepool-functional-py35-src-base
     vars:
       devstack_localrc:
-        NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB: false
         NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB: false
 
 - project:
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 78691f933..3ed3ec186 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -207,7 +207,6 @@ EOF
     fi
 
     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
@@ -220,9 +219,6 @@ EOF
     if $NODEPOOL_PAUSE_CENTOS_7_DIB ; then
        NODEPOOL_CENTOS_7_MIN_READY=0
     fi
-    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
@@ -262,8 +258,6 @@ zookeeper-servers:
 labels:
   - name: centos-7
     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
@@ -292,8 +286,6 @@ providers:
     diskimages:
       - name: centos-7
         config-drive: true
-      - name: debian-jessie
-        config-drive: true
       - name: debian-stretch
         config-drive: true
       - name: fedora-27
@@ -320,12 +312,6 @@ providers:
             flavor-name: 'nodepool'
             console-log: True
             key-name: $NODEPOOL_KEY_NAME
-          - name: debian-jessie
-            diskimage: debian-jessie
-            min-ram: 512
-            flavor-name: 'nodepool'
-            console-log: True
-            key-name: $NODEPOOL_KEY_NAME
           - name: debian-stretch
             diskimage: debian-stretch
             min-ram: 512
@@ -398,33 +384,6 @@ diskimages:
       $DIB_GLEAN_INSTALLTYPE
       $DIB_GLEAN_REPOLOCATION
       $DIB_GLEAN_REPOREF
-  - name: debian-jessie
-    pause: $NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB
-    rebuild-age: 86400
-    elements:
-      - debian-minimal
-      - vm
-      - simple-init
-      - growroot
-      - devuser
-      - openssh-server
-      - nodepool-setup
-    release: jessie
-    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_APT_LOCAL_CACHE: '0'
-      DIB_DISABLE_APT_CLEANUP: '1'
-      DIB_DEV_USER_AUTHORIZED_KEYS: $NODEPOOL_PUBKEY
-      DIB_DEBIAN_COMPONENTS: 'main'
-      $DIB_DISTRIBUTION_MIRROR_DEBIAN
-      $DIB_DEBOOTSTRAP_EXTRA_ARGS
-      $DIB_GET_PIP
-      $DIB_GLEAN_INSTALLTYPE
-      $DIB_GLEAN_REPOLOCATION
-      $DIB_GLEAN_REPOREF
   - name: debian-stretch
     pause: $NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB
     rebuild-age: 86400
diff --git a/devstack/settings b/devstack/settings
index 2c7898ee0..63af13a27 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -7,7 +7,6 @@ NODEPOOL_DIB_BASE_PATH=/opt/dib
 # NOTE(pabelanger): Be sure to also update tools/check_devstack_plugin.sh if you
 # 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}
diff --git a/tools/check_devstack_plugin.sh b/tools/check_devstack_plugin.sh
index 87822083e..618bc211b 100755
--- a/tools/check_devstack_plugin.sh
+++ b/tools/check_devstack_plugin.sh
@@ -20,7 +20,6 @@ else
     source /opt/stack/devstack/stackrc
 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}
@@ -90,15 +89,6 @@ if [ ${NODEPOOL_PAUSE_CENTOS_7_DIB,,} = 'false' ]; then
     sshintonode centos-7
 fi
 
-if [ ${NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB,,} = 'false' ]; then
-    # check that image built
-    waitforimage debian-jessie
-    # check image was bootable
-    waitfornode debian-jessie
-    # check ssh for root user
-    sshintonode debian-jessie
-fi
-
 if [ ${NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB,,} = 'false' ]; then
     # check that image built
     waitforimage debian-stretch