summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-01-09 05:54:07 +0000
committerGerrit Code Review <review@openstack.org>2019-01-09 05:54:07 +0000
commit2427bfb277cabbbfd489abf1894f546d4e7e4b5e (patch)
tree993e52032c9c70eba384389696fb3274aeaec1ad
parentf8bf6afd08bcdcee06b377fda71ad543a63f2ffc (diff)
parent4422d535293446995caa38bdb72e91e8183b48db (diff)
Merge "Add Fedora 29 testing"
-rw-r--r--.zuul.yaml2
-rw-r--r--devstack/plugin.sh24
-rw-r--r--devstack/settings2
-rwxr-xr-xtools/check_devstack_plugin.sh31
4 files changed, 41 insertions, 18 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index ce7e2bb..7340618 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -94,7 +94,7 @@
94 vars: 94 vars:
95 devstack_localrc: 95 devstack_localrc:
96 NODEPOOL_PAUSE_CENTOS_7_DIB: false 96 NODEPOOL_PAUSE_CENTOS_7_DIB: false
97 NODEPOOL_PAUSE_FEDORA_28_DIB: false 97 NODEPOOL_PAUSE_FEDORA_29_DIB: false
98 98
99- job: 99- job:
100 name: nodepool-functional-py35-suse-src 100 name: nodepool-functional-py35-suse-src
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 19cd0d5..80fafe7 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -201,7 +201,7 @@ EOF
201 201
202 NODEPOOL_CENTOS_7_MIN_READY=1 202 NODEPOOL_CENTOS_7_MIN_READY=1
203 NODEPOOL_DEBIAN_STRETCH_MIN_READY=1 203 NODEPOOL_DEBIAN_STRETCH_MIN_READY=1
204 NODEPOOL_FEDORA_28_MIN_READY=1 204 NODEPOOL_FEDORA_29_MIN_READY=1
205 NODEPOOL_UBUNTU_BIONIC_MIN_READY=1 205 NODEPOOL_UBUNTU_BIONIC_MIN_READY=1
206 NODEPOOL_UBUNTU_TRUSTY_MIN_READY=1 206 NODEPOOL_UBUNTU_TRUSTY_MIN_READY=1
207 NODEPOOL_UBUNTU_XENIAL_MIN_READY=1 207 NODEPOOL_UBUNTU_XENIAL_MIN_READY=1
@@ -216,8 +216,8 @@ EOF
216 if $NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB ; then 216 if $NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB ; then
217 NODEPOOL_DEBIAN_STRETCH_MIN_READY=0 217 NODEPOOL_DEBIAN_STRETCH_MIN_READY=0
218 fi 218 fi
219 if $NODEPOOL_PAUSE_FEDORA_28_DIB ; then 219 if $NODEPOOL_PAUSE_FEDORA_29_DIB ; then
220 NODEPOOL_FEDORA_28_MIN_READY=0 220 NODEPOOL_FEDORA_29_MIN_READY=0
221 fi 221 fi
222 if $NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB ; then 222 if $NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB ; then
223 NODEPOOL_UBUNTU_BIONIC_MIN_READY=0 223 NODEPOOL_UBUNTU_BIONIC_MIN_READY=0
@@ -257,8 +257,8 @@ labels:
257 min-ready: $NODEPOOL_CENTOS_7_MIN_READY 257 min-ready: $NODEPOOL_CENTOS_7_MIN_READY
258 - name: debian-stretch 258 - name: debian-stretch
259 min-ready: $NODEPOOL_DEBIAN_STRETCH_MIN_READY 259 min-ready: $NODEPOOL_DEBIAN_STRETCH_MIN_READY
260 - name: fedora-28 260 - name: fedora-29
261 min-ready: $NODEPOOL_FEDORA_28_MIN_READY 261 min-ready: $NODEPOOL_FEDORA_29_MIN_READY
262 - name: ubuntu-bionic 262 - name: ubuntu-bionic
263 min-ready: $NODEPOOL_UBUNTU_BIONIC_MIN_READY 263 min-ready: $NODEPOOL_UBUNTU_BIONIC_MIN_READY
264 - name: ubuntu-trusty 264 - name: ubuntu-trusty
@@ -287,7 +287,7 @@ providers:
287 config-drive: true 287 config-drive: true
288 - name: debian-stretch 288 - name: debian-stretch
289 config-drive: true 289 config-drive: true
290 - name: fedora-28 290 - name: fedora-29
291 config-drive: true 291 config-drive: true
292 - name: ubuntu-bionic 292 - name: ubuntu-bionic
293 config-drive: true 293 config-drive: true
@@ -323,8 +323,8 @@ providers:
323 key-name: $NODEPOOL_KEY_NAME 323 key-name: $NODEPOOL_KEY_NAME
324 instance-properties: 324 instance-properties:
325 nodepool_devstack: testing 325 nodepool_devstack: testing
326 - name: fedora-28 326 - name: fedora-29
327 diskimage: fedora-28 327 diskimage: fedora-29
328 min-ram: 1024 328 min-ram: 1024
329 flavor-name: 'nodepool' 329 flavor-name: 'nodepool'
330 console-log: True 330 console-log: True
@@ -411,6 +411,7 @@ diskimages:
411 $DIB_GLEAN_INSTALLTYPE 411 $DIB_GLEAN_INSTALLTYPE
412 $DIB_GLEAN_REPOLOCATION 412 $DIB_GLEAN_REPOLOCATION
413 $DIB_GLEAN_REPOREF 413 $DIB_GLEAN_REPOREF
414 DIB_SIMPLE_INIT_NETWORKMANAGER: '1'
414 - name: debian-stretch 415 - name: debian-stretch
415 pause: $NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB 416 pause: $NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB
416 rebuild-age: 86400 417 rebuild-age: 86400
@@ -438,8 +439,8 @@ diskimages:
438 $DIB_GLEAN_INSTALLTYPE 439 $DIB_GLEAN_INSTALLTYPE
439 $DIB_GLEAN_REPOLOCATION 440 $DIB_GLEAN_REPOLOCATION
440 $DIB_GLEAN_REPOREF 441 $DIB_GLEAN_REPOREF
441 - name: fedora-28 442 - name: fedora-29
442 pause: $NODEPOOL_PAUSE_FEDORA_28_DIB 443 pause: $NODEPOOL_PAUSE_FEDORA_29_DIB
443 rebuild-age: 86400 444 rebuild-age: 86400
444 elements: 445 elements:
445 - fedora-minimal 446 - fedora-minimal
@@ -449,7 +450,7 @@ diskimages:
449 - devuser 450 - devuser
450 - openssh-server 451 - openssh-server
451 - nodepool-setup 452 - nodepool-setup
452 release: 28 453 release: 29
453 env-vars: 454 env-vars:
454 TMPDIR: $NODEPOOL_DIB_BASE_PATH/tmp 455 TMPDIR: $NODEPOOL_DIB_BASE_PATH/tmp
455 DIB_CHECKSUM: '1' 456 DIB_CHECKSUM: '1'
@@ -460,6 +461,7 @@ diskimages:
460 $DIB_GLEAN_INSTALLTYPE 461 $DIB_GLEAN_INSTALLTYPE
461 $DIB_GLEAN_REPOLOCATION 462 $DIB_GLEAN_REPOLOCATION
462 $DIB_GLEAN_REPOREF 463 $DIB_GLEAN_REPOREF
464 DIB_SIMPLE_INIT_NETWORKMANAGER: '1'
463 - name: ubuntu-bionic 465 - name: ubuntu-bionic
464 pause: $NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB 466 pause: $NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB
465 rebuild-age: 86400 467 rebuild-age: 86400
diff --git a/devstack/settings b/devstack/settings
index 9957226..1308aa1 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -8,7 +8,7 @@ NODEPOOL_DIB_BASE_PATH=/opt/dib
8# change the defaults. 8# change the defaults.
9NODEPOOL_PAUSE_CENTOS_7_DIB=${NODEPOOL_PAUSE_CENTOS_7_DIB:-true} 9NODEPOOL_PAUSE_CENTOS_7_DIB=${NODEPOOL_PAUSE_CENTOS_7_DIB:-true}
10NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB=${NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB:-true} 10NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB=${NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB:-true}
11NODEPOOL_PAUSE_FEDORA_28_DIB=${NODEPOOL_PAUSE_FEDORA_28_DIB:-true} 11NODEPOOL_PAUSE_FEDORA_29_DIB=${NODEPOOL_PAUSE_FEDORA_29_DIB:-true}
12NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB=${NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB:-true} 12NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB=${NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB:-true}
13NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=${NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB:-true} 13NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=${NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB:-true}
14NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=${NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB:-true} 14NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=${NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB:-true}
diff --git a/tools/check_devstack_plugin.sh b/tools/check_devstack_plugin.sh
index eaa8b19..6f7a05d 100755
--- a/tools/check_devstack_plugin.sh
+++ b/tools/check_devstack_plugin.sh
@@ -21,7 +21,7 @@ else
21fi 21fi
22NODEPOOL_PAUSE_CENTOS_7_DIB=${NODEPOOL_PAUSE_CENTOS_7_DIB:-True} 22NODEPOOL_PAUSE_CENTOS_7_DIB=${NODEPOOL_PAUSE_CENTOS_7_DIB:-True}
23NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB=${NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB:-True} 23NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB=${NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB:-True}
24NODEPOOL_PAUSE_FEDORA_28_DIB=${NODEPOOL_PAUSE_FEDORA_28_DIB:-True} 24NODEPOOL_PAUSE_FEDORA_29_DIB=${NODEPOOL_PAUSE_FEDORA_29_DIB:-True}
25NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB=${NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB:-True} 25NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB=${NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB:-True}
26NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=${NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB:-True} 26NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=${NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB:-True}
27NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=${NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB:-True} 27NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=${NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB:-True}
@@ -61,6 +61,23 @@ function sshintonode {
61 fi 61 fi
62} 62}
63 63
64function 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
64function waitforimage { 81function waitforimage {
65 local name=$1 82 local name=$1
66 local state='ready' 83 local state='ready'
@@ -97,6 +114,8 @@ if [ ${NODEPOOL_PAUSE_CENTOS_7_DIB,,} = 'false' ]; then
97 waitfornode centos-7 114 waitfornode centos-7
98 # check ssh for root user 115 # check ssh for root user
99 sshintonode centos-7 116 sshintonode centos-7
117 # networkmanager check
118 checknm centos-7
100fi 119fi
101 120
102if [ ${NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB,,} = 'false' ]; then 121if [ ${NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB,,} = 'false' ]; then
@@ -108,13 +127,15 @@ if [ ${NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB,,} = 'false' ]; then
108 sshintonode debian-stretch 127 sshintonode debian-stretch
109fi 128fi
110 129
111if [ ${NODEPOOL_PAUSE_FEDORA_28_DIB,,} = 'false' ]; then 130if [ ${NODEPOOL_PAUSE_FEDORA_29_DIB,,} = 'false' ]; then
112 # check that image built 131 # check that image built
113 waitforimage fedora-28 132 waitforimage fedora-29
114 # check image was bootable 133 # check image was bootable
115 waitfornode fedora-28 134 waitfornode fedora-29
116 # check ssh for root user 135 # check ssh for root user
117 sshintonode fedora-28 136 sshintonode fedora-29
137 # networkmanager check
138 checknm fedora-29
118fi 139fi
119 140
120if [ ${NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB,,} = 'false' ]; then 141if [ ${NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB,,} = 'false' ]; then