Browse Source

Merge "Update devstack test to Fedora 28"

tags/3.4.0
Zuul 5 months ago
parent
commit
f13c736f52
4 changed files with 18 additions and 18 deletions
  1. 1
    1
      .zuul.yaml
  2. 11
    11
      devstack/plugin.sh
  3. 1
    1
      devstack/settings
  4. 5
    5
      tools/check_devstack_plugin.sh

+ 1
- 1
.zuul.yaml View File

@@ -85,7 +85,7 @@
85 85
     vars:
86 86
       devstack_localrc:
87 87
         NODEPOOL_PAUSE_CENTOS_7_DIB: false
88
-        NODEPOOL_PAUSE_FEDORA_27_DIB: false
88
+        NODEPOOL_PAUSE_FEDORA_28_DIB: false
89 89
 
90 90
 - job:
91 91
     name: nodepool-functional-py35-suse-src

+ 11
- 11
devstack/plugin.sh View File

@@ -201,7 +201,7 @@ EOF
201 201
 
202 202
     NODEPOOL_CENTOS_7_MIN_READY=1
203 203
     NODEPOOL_DEBIAN_STRETCH_MIN_READY=1
204
-    NODEPOOL_FEDORA_27_MIN_READY=1
204
+    NODEPOOL_FEDORA_28_MIN_READY=1
205 205
     NODEPOOL_UBUNTU_BIONIC_MIN_READY=1
206 206
     NODEPOOL_UBUNTU_TRUSTY_MIN_READY=1
207 207
     NODEPOOL_UBUNTU_XENIAL_MIN_READY=1
@@ -216,8 +216,8 @@ EOF
216 216
     if $NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB ; then
217 217
        NODEPOOL_DEBIAN_STRETCH_MIN_READY=0
218 218
     fi
219
-    if $NODEPOOL_PAUSE_FEDORA_27_DIB ; then
220
-       NODEPOOL_FEDORA_27_MIN_READY=0
219
+    if $NODEPOOL_PAUSE_FEDORA_28_DIB ; then
220
+       NODEPOOL_FEDORA_28_MIN_READY=0
221 221
     fi
222 222
     if $NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB ; then
223 223
        NODEPOOL_UBUNTU_BIONIC_MIN_READY=0
@@ -257,8 +257,8 @@ labels:
257 257
     min-ready: $NODEPOOL_CENTOS_7_MIN_READY
258 258
   - name: debian-stretch
259 259
     min-ready: $NODEPOOL_DEBIAN_STRETCH_MIN_READY
260
-  - name: fedora-27
261
-    min-ready: $NODEPOOL_FEDORA_27_MIN_READY
260
+  - name: fedora-28
261
+    min-ready: $NODEPOOL_FEDORA_28_MIN_READY
262 262
   - name: ubuntu-bionic
263 263
     min-ready: $NODEPOOL_UBUNTU_BIONIC_MIN_READY
264 264
   - name: ubuntu-trusty
@@ -287,7 +287,7 @@ providers:
287 287
         config-drive: true
288 288
       - name: debian-stretch
289 289
         config-drive: true
290
-      - name: fedora-27
290
+      - name: fedora-28
291 291
         config-drive: true
292 292
       - name: ubuntu-bionic
293 293
         config-drive: true
@@ -323,8 +323,8 @@ providers:
323 323
             key-name: $NODEPOOL_KEY_NAME
324 324
             instance-properties:
325 325
               nodepool_devstack: testing
326
-          - name: fedora-27
327
-            diskimage: fedora-27
326
+          - name: fedora-28
327
+            diskimage: fedora-28
328 328
             min-ram: 1024
329 329
             flavor-name: 'nodepool'
330 330
             console-log: True
@@ -438,8 +438,8 @@ diskimages:
438 438
       $DIB_GLEAN_INSTALLTYPE
439 439
       $DIB_GLEAN_REPOLOCATION
440 440
       $DIB_GLEAN_REPOREF
441
-  - name: fedora-27
442
-    pause: $NODEPOOL_PAUSE_FEDORA_27_DIB
441
+  - name: fedora-28
442
+    pause: $NODEPOOL_PAUSE_FEDORA_28_DIB
443 443
     rebuild-age: 86400
444 444
     elements:
445 445
       - fedora-minimal
@@ -449,7 +449,7 @@ diskimages:
449 449
       - devuser
450 450
       - openssh-server
451 451
       - nodepool-setup
452
-    release: 27
452
+    release: 28
453 453
     env-vars:
454 454
       TMPDIR: $NODEPOOL_DIB_BASE_PATH/tmp
455 455
       DIB_CHECKSUM: '1'

+ 1
- 1
devstack/settings View File

@@ -8,7 +8,7 @@ NODEPOOL_DIB_BASE_PATH=/opt/dib
8 8
 # change the defaults.
9 9
 NODEPOOL_PAUSE_CENTOS_7_DIB=${NODEPOOL_PAUSE_CENTOS_7_DIB:-true}
10 10
 NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB=${NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB:-true}
11
-NODEPOOL_PAUSE_FEDORA_27_DIB=${NODEPOOL_PAUSE_FEDORA_27_DIB:-true}
11
+NODEPOOL_PAUSE_FEDORA_28_DIB=${NODEPOOL_PAUSE_FEDORA_28_DIB:-true}
12 12
 NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB=${NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB:-true}
13 13
 NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=${NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB:-true}
14 14
 NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=${NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB:-true}

+ 5
- 5
tools/check_devstack_plugin.sh View File

@@ -21,7 +21,7 @@ else
21 21
 fi
22 22
 NODEPOOL_PAUSE_CENTOS_7_DIB=${NODEPOOL_PAUSE_CENTOS_7_DIB:-True}
23 23
 NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB=${NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB:-True}
24
-NODEPOOL_PAUSE_FEDORA_27_DIB=${NODEPOOL_PAUSE_FEDORA_27_DIB:-True}
24
+NODEPOOL_PAUSE_FEDORA_28_DIB=${NODEPOOL_PAUSE_FEDORA_28_DIB:-True}
25 25
 NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB=${NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB:-True}
26 26
 NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=${NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB:-True}
27 27
 NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=${NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB:-True}
@@ -108,13 +108,13 @@ if [ ${NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB,,} = 'false' ]; then
108 108
     sshintonode debian-stretch
109 109
 fi
110 110
 
111
-if [ ${NODEPOOL_PAUSE_FEDORA_27_DIB,,} = 'false' ]; then
111
+if [ ${NODEPOOL_PAUSE_FEDORA_28_DIB,,} = 'false' ]; then
112 112
     # check that image built
113
-    waitforimage fedora-27
113
+    waitforimage fedora-28
114 114
     # check image was bootable
115
-    waitfornode fedora-27
115
+    waitfornode fedora-28
116 116
     # check ssh for root user
117
-    sshintonode fedora-27
117
+    sshintonode fedora-28
118 118
 fi
119 119
 
120 120
 if [ ${NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB,,} = 'false' ]; then

Loading…
Cancel
Save