Merge "Add debian-jessie DIB for dsvm testing"

devstack/plugin.sh

@@ -196,9 +196,11 @@ EOF
         NODEPOOL_MIRROR_HOST=$(echo $NODEPOOL_MIRROR_HOST|tr '[:upper:]' '[:lower:]')
 
         NODEPOOL_CENTOS_MIRROR=${NODEPOOL_CENTOS_MIRROR:-http://$NODEPOOL_MIRROR_HOST/centos}
+        NODEPOOL_DEBIAN_MIRROR=${NODEPOOL_DEBIAN_MIRROR:-http://$NODEPOOL_MIRROR_HOST/debian}
         NODEPOOL_UBUNTU_MIRROR=${NODEPOOL_UBUNTU_MIRROR:-http://$NODEPOOL_MIRROR_HOST/ubuntu}
 
         DIB_DISTRIBUTION_MIRROR_CENTOS="DIB_DISTRIBUTION_MIRROR: $NODEPOOL_CENTOS_MIRROR"
+        DIB_DISTRIBUTION_MIRROR_DEBIAN="DIB_DISTRIBUTION_MIRROR: $NODEPOOL_DEBIAN_MIRROR"
         DIB_DISTRIBUTION_MIRROR_UBUNTU="DIB_DISTRIBUTION_MIRROR: $NODEPOOL_UBUNTU_MIRROR"
         DIB_DEBOOTSTRAP_EXTRA_ARGS="DIB_DEBOOTSTRAP_EXTRA_ARGS: '--no-check-gpg'"
     fi
@@ -239,6 +241,11 @@ labels:
     min-ready: 1
     providers:
       - name: devstack
+  - name: debian-jessie
+    image: debian-jessie
+    min-ready: 1
+    providers:
+      - name: devstack
   - name: fedora-25
     image: fedora-25
     min-ready: 1
@@ -277,6 +284,12 @@ providers:
         username: devuser
         private-key: $NODEPOOL_KEY
         config-drive: true
+      - name: debian-jessie
+        min-ram: 512
+        name-filter: 'nodepool'
+        username: devuser
+        private-key: $NODEPOOL_KEY
+        config-drive: true
       - name: fedora-25
         min-ram: 1024
         name-filter: 'nodepool'
@@ -323,6 +336,31 @@ 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
+      - devuser
+      - openssh-server
+      - nodepool-setup
+    release: jessie
+    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_DISTRIBUTION_MIRROR_DEBIAN
+      $DIB_DEBOOTSTRAP_EXTRA_ARGS
+      $DIB_GET_PIP
+      $DIB_GLEAN_INSTALLTYPE
+      $DIB_GLEAN_REPOLOCATION
+      $DIB_GLEAN_REPOREF
   - name: fedora-25
     pause: $NODEPOOL_PAUSE_FEDORA_25_DIB
     rebuild-age: 86400

devstack/settings

@@ -7,6 +7,7 @@ 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_FEDORA_25_DIB=${NODEPOOL_PAUSE_FEDORA_25_DIB:-true}
 NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB=${NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB:-true}
 NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=${NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB:-false}

tools/check_devstack_plugin.sh

@@ -9,6 +9,7 @@ NODEPOOL="$NODEPOOL_INSTALL/bin/nodepool -c $NODEPOOL_CONFIG -s $NODEPOOL_SECURE
 # NOTE(pabelanger): Be sure to also update devstack/settings 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_FEDORA_25_DIB=${NODEPOOL_PAUSE_FEDORA_25_DIB:-true}
 NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB=${NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB:-true}
 NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=${NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB:-false}
@@ -47,6 +48,13 @@ if [ $NODEPOOL_PAUSE_CENTOS_7_DIB = 'false' ]; then
     waitfornode 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
+fi
+
 if [ $NODEPOOL_PAUSE_FEDORA_25_DIB = 'false' ]; then
     # check that image built
     waitforimage fedora-25