summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-11-27 19:44:12 +0000
committerGerrit Code Review <review@openstack.org>2018-11-27 19:44:12 +0000
commitf13c736f52467a138238ace4c57fc68243abe12b (patch)
treea31d45b64510f1a47c41bced9ff0d2d3f3410f1f
parente4f245eb1310935f3acdbf06616e93e7855482f5 (diff)
parent7679b2c14b14e7b1035b4b870926af00dfbd688f (diff)
Merge "Update devstack test to Fedora 28"
-rw-r--r--.zuul.yaml2
-rw-r--r--devstack/plugin.sh22
-rw-r--r--devstack/settings2
-rwxr-xr-xtools/check_devstack_plugin.sh10
4 files changed, 18 insertions, 18 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index 65349c7..6a3ea7c 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -85,7 +85,7 @@
85 vars: 85 vars:
86 devstack_localrc: 86 devstack_localrc:
87 NODEPOOL_PAUSE_CENTOS_7_DIB: false 87 NODEPOOL_PAUSE_CENTOS_7_DIB: false
88 NODEPOOL_PAUSE_FEDORA_27_DIB: false 88 NODEPOOL_PAUSE_FEDORA_28_DIB: false
89 89
90- job: 90- job:
91 name: nodepool-functional-py35-suse-src 91 name: nodepool-functional-py35-suse-src
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index e690c80..b5d15f9 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_27_MIN_READY=1 204 NODEPOOL_FEDORA_28_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_27_DIB ; then 219 if $NODEPOOL_PAUSE_FEDORA_28_DIB ; then
220 NODEPOOL_FEDORA_27_MIN_READY=0 220 NODEPOOL_FEDORA_28_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-27 260 - name: fedora-28
261 min-ready: $NODEPOOL_FEDORA_27_MIN_READY 261 min-ready: $NODEPOOL_FEDORA_28_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-27 290 - name: fedora-28
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-27 326 - name: fedora-28
327 diskimage: fedora-27 327 diskimage: fedora-28
328 min-ram: 1024 328 min-ram: 1024
329 flavor-name: 'nodepool' 329 flavor-name: 'nodepool'
330 console-log: True 330 console-log: True
@@ -438,8 +438,8 @@ diskimages:
438 $DIB_GLEAN_INSTALLTYPE 438 $DIB_GLEAN_INSTALLTYPE
439 $DIB_GLEAN_REPOLOCATION 439 $DIB_GLEAN_REPOLOCATION
440 $DIB_GLEAN_REPOREF 440 $DIB_GLEAN_REPOREF
441 - name: fedora-27 441 - name: fedora-28
442 pause: $NODEPOOL_PAUSE_FEDORA_27_DIB 442 pause: $NODEPOOL_PAUSE_FEDORA_28_DIB
443 rebuild-age: 86400 443 rebuild-age: 86400
444 elements: 444 elements:
445 - fedora-minimal 445 - fedora-minimal
@@ -449,7 +449,7 @@ diskimages:
449 - devuser 449 - devuser
450 - openssh-server 450 - openssh-server
451 - nodepool-setup 451 - nodepool-setup
452 release: 27 452 release: 28
453 env-vars: 453 env-vars:
454 TMPDIR: $NODEPOOL_DIB_BASE_PATH/tmp 454 TMPDIR: $NODEPOOL_DIB_BASE_PATH/tmp
455 DIB_CHECKSUM: '1' 455 DIB_CHECKSUM: '1'
diff --git a/devstack/settings b/devstack/settings
index fe169dc..9957226 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_27_DIB=${NODEPOOL_PAUSE_FEDORA_27_DIB:-true} 11NODEPOOL_PAUSE_FEDORA_28_DIB=${NODEPOOL_PAUSE_FEDORA_28_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 bb499ca..eaa8b19 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_27_DIB=${NODEPOOL_PAUSE_FEDORA_27_DIB:-True} 24NODEPOOL_PAUSE_FEDORA_28_DIB=${NODEPOOL_PAUSE_FEDORA_28_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}
@@ -108,13 +108,13 @@ if [ ${NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB,,} = 'false' ]; then
108 sshintonode debian-stretch 108 sshintonode debian-stretch
109fi 109fi
110 110
111if [ ${NODEPOOL_PAUSE_FEDORA_27_DIB,,} = 'false' ]; then 111if [ ${NODEPOOL_PAUSE_FEDORA_28_DIB,,} = 'false' ]; then
112 # check that image built 112 # check that image built
113 waitforimage fedora-27 113 waitforimage fedora-28
114 # check image was bootable 114 # check image was bootable
115 waitfornode fedora-27 115 waitfornode fedora-28
116 # check ssh for root user 116 # check ssh for root user
117 sshintonode fedora-27 117 sshintonode fedora-28
118fi 118fi
119 119
120if [ ${NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB,,} = 'false' ]; then 120if [ ${NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB,,} = 'false' ]; then