Merge "Support fedora-26 for nodepool dsvm job"

devstack/plugin.sh

@@ -253,6 +253,11 @@ labels:
     min-ready: 1
     providers:
       - name: devstack
+  - name: fedora-26
+    image: fedora-26
+    min-ready: 1
+    providers:
+      - name: devstack
   - name: opensuse-42.2
     image: opensuse-42.2
     min-ready: 1
@@ -306,6 +311,13 @@ providers:
         private-key: $NODEPOOL_KEY
         config-drive: true
         key-name: $NODEPOOL_KEY_NAME
+      - name: fedora-26
+        min-ram: 1024
+        name-filter: 'nodepool'
+        username: devuser
+        private-key: $NODEPOOL_KEY
+        config-drive: true
+        key-name: $NODEPOOL_KEY_NAME
       - name: opensuse-42.2
         min-ram: 1024
         name-filter: 'nodepool'
@@ -402,6 +414,27 @@ diskimages:
       $DIB_GLEAN_INSTALLTYPE
       $DIB_GLEAN_REPOLOCATION
       $DIB_GLEAN_REPOREF
+  - name: fedora-26
+    pause: $NODEPOOL_PAUSE_FEDORA_26_DIB
+    rebuild-age: 86400
+    elements:
+      - fedora-minimal
+      - vm
+      - simple-init
+      - devuser
+      - openssh-server
+      - nodepool-setup
+    release: 26
+    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_DISTRIBUTION_MIRROR_FEDORA
+      $DIB_GET_PIP
+      $DIB_GLEAN_INSTALLTYPE
+      $DIB_GLEAN_REPOLOCATION
+      $DIB_GLEAN_REPOREF
   - name: opensuse-42.2
     pause: $NODEPOOL_PAUSE_OPENSUSE_42_2_DIB
     rebuild-age: 86400

devstack/settings

@@ -9,6 +9,7 @@ NODEPOOL_DIB_BASE_PATH=/opt/dib
 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_FEDORA_26_DIB=${NODEPOOL_PAUSE_FEDORA_26_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}

tools/check_devstack_plugin.sh

@@ -11,6 +11,7 @@ NODEPOOL="$NODEPOOL_INSTALL/bin/nodepool -c $NODEPOOL_CONFIG -s $NODEPOOL_SECURE
 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_FEDORA_26_DIB=${NODEPOOL_PAUSE_FEDORA_26_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}
@@ -77,6 +78,15 @@ if [ $NODEPOOL_PAUSE_FEDORA_25_DIB = 'false' ]; then
     sshintonode fedora-25
 fi
 
+if [ $NODEPOOL_PAUSE_FEDORA_26_DIB = 'false' ]; then
+    # check that image built
+    waitforimage fedora-26
+    # check image was bootable
+    waitfornode fedora-26
+    # check ssh for root user
+    sshintonode fedora-26
+fi
+
 if [ $NODEPOOL_PAUSE_OPENSUSE_42_2_DIB = 'false' ]; then
     # check that image built
     waitforimage opensuse-42.2