Browse Source

Merge "Add Fedora 29 testing"

tags/3.5.0
Zuul 4 months ago
parent
commit
2427bfb277
4 changed files with 41 additions and 18 deletions
  1. 1
    1
      .zuul.yaml
  2. 13
    11
      devstack/plugin.sh
  3. 1
    1
      devstack/settings
  4. 26
    5
      tools/check_devstack_plugin.sh

+ 1
- 1
.zuul.yaml View File

@@ -94,7 +94,7 @@
94 94
     vars:
95 95
       devstack_localrc:
96 96
         NODEPOOL_PAUSE_CENTOS_7_DIB: false
97
-        NODEPOOL_PAUSE_FEDORA_28_DIB: false
97
+        NODEPOOL_PAUSE_FEDORA_29_DIB: false
98 98
 
99 99
 - job:
100 100
     name: nodepool-functional-py35-suse-src

+ 13
- 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_28_MIN_READY=1
204
+    NODEPOOL_FEDORA_29_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_28_DIB ; then
220
-       NODEPOOL_FEDORA_28_MIN_READY=0
219
+    if $NODEPOOL_PAUSE_FEDORA_29_DIB ; then
220
+       NODEPOOL_FEDORA_29_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-28
261
-    min-ready: $NODEPOOL_FEDORA_28_MIN_READY
260
+  - name: fedora-29
261
+    min-ready: $NODEPOOL_FEDORA_29_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-28
290
+      - name: fedora-29
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-28
327
-            diskimage: fedora-28
326
+          - name: fedora-29
327
+            diskimage: fedora-29
328 328
             min-ram: 1024
329 329
             flavor-name: 'nodepool'
330 330
             console-log: True
@@ -411,6 +411,7 @@ diskimages:
411 411
       $DIB_GLEAN_INSTALLTYPE
412 412
       $DIB_GLEAN_REPOLOCATION
413 413
       $DIB_GLEAN_REPOREF
414
+      DIB_SIMPLE_INIT_NETWORKMANAGER: '1'
414 415
   - name: debian-stretch
415 416
     pause: $NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB
416 417
     rebuild-age: 86400
@@ -438,8 +439,8 @@ diskimages:
438 439
       $DIB_GLEAN_INSTALLTYPE
439 440
       $DIB_GLEAN_REPOLOCATION
440 441
       $DIB_GLEAN_REPOREF
441
-  - name: fedora-28
442
-    pause: $NODEPOOL_PAUSE_FEDORA_28_DIB
442
+  - name: fedora-29
443
+    pause: $NODEPOOL_PAUSE_FEDORA_29_DIB
443 444
     rebuild-age: 86400
444 445
     elements:
445 446
       - fedora-minimal
@@ -449,7 +450,7 @@ diskimages:
449 450
       - devuser
450 451
       - openssh-server
451 452
       - nodepool-setup
452
-    release: 28
453
+    release: 29
453 454
     env-vars:
454 455
       TMPDIR: $NODEPOOL_DIB_BASE_PATH/tmp
455 456
       DIB_CHECKSUM: '1'
@@ -460,6 +461,7 @@ diskimages:
460 461
       $DIB_GLEAN_INSTALLTYPE
461 462
       $DIB_GLEAN_REPOLOCATION
462 463
       $DIB_GLEAN_REPOREF
464
+      DIB_SIMPLE_INIT_NETWORKMANAGER: '1'
463 465
   - name: ubuntu-bionic
464 466
     pause: $NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB
465 467
     rebuild-age: 86400

+ 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_28_DIB=${NODEPOOL_PAUSE_FEDORA_28_DIB:-true}
11
+NODEPOOL_PAUSE_FEDORA_29_DIB=${NODEPOOL_PAUSE_FEDORA_29_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}

+ 26
- 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_28_DIB=${NODEPOOL_PAUSE_FEDORA_28_DIB:-True}
24
+NODEPOOL_PAUSE_FEDORA_29_DIB=${NODEPOOL_PAUSE_FEDORA_29_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}
@@ -61,6 +61,23 @@ function sshintonode {
61 61
     fi
62 62
 }
63 63
 
64
+function checknm {
65
+    name=$1
66
+    state='ready'
67
+
68
+    node=`$NODEPOOL list | grep $name | grep $state | cut -d '|' -f6 | tr -d ' '`
69
+    nm_output=$(/tmp/ssh_wrapper $node -- nmcli c)
70
+
71
+    # virtio device is eth0 on older, ens3 on newer
72
+    if [[ ! ${nm_output} =~ (eth0|ens3) ]]; then
73
+        echo "*** Failed to find interface in NetworkManager connections"
74
+        /tmp/ssh_wrapper $node -- nmcli c
75
+        /tmp/ssh_wrapper $node -- nmcli device
76
+        FAILURE_REASON="Failed to find interface in NetworkManager connections"
77
+        RETURN=1
78
+    fi
79
+}
80
+
64 81
 function waitforimage {
65 82
     local name=$1
66 83
     local state='ready'
@@ -97,6 +114,8 @@ if [ ${NODEPOOL_PAUSE_CENTOS_7_DIB,,} = 'false' ]; then
97 114
     waitfornode centos-7
98 115
     # check ssh for root user
99 116
     sshintonode centos-7
117
+    # networkmanager check
118
+    checknm centos-7
100 119
 fi
101 120
 
102 121
 if [ ${NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB,,} = 'false' ]; then
@@ -108,13 +127,15 @@ if [ ${NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB,,} = 'false' ]; then
108 127
     sshintonode debian-stretch
109 128
 fi
110 129
 
111
-if [ ${NODEPOOL_PAUSE_FEDORA_28_DIB,,} = 'false' ]; then
130
+if [ ${NODEPOOL_PAUSE_FEDORA_29_DIB,,} = 'false' ]; then
112 131
     # check that image built
113
-    waitforimage fedora-28
132
+    waitforimage fedora-29
114 133
     # check image was bootable
115
-    waitfornode fedora-28
134
+    waitfornode fedora-29
116 135
     # check ssh for root user
117
-    sshintonode fedora-28
136
+    sshintonode fedora-29
137
+    # networkmanager check
138
+    checknm fedora-29
118 139
 fi
119 140
 
120 141
 if [ ${NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB,,} = 'false' ]; then

Loading…
Cancel
Save