diff --git a/.zuul.yaml b/.zuul.yaml index ce7e2bbd2..734061874 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -94,7 +94,7 @@ vars: devstack_localrc: NODEPOOL_PAUSE_CENTOS_7_DIB: false - NODEPOOL_PAUSE_FEDORA_28_DIB: false + NODEPOOL_PAUSE_FEDORA_29_DIB: false - job: name: nodepool-functional-py35-suse-src diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 19cd0d5bc..80fafe7d9 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -201,7 +201,7 @@ EOF NODEPOOL_CENTOS_7_MIN_READY=1 NODEPOOL_DEBIAN_STRETCH_MIN_READY=1 - NODEPOOL_FEDORA_28_MIN_READY=1 + NODEPOOL_FEDORA_29_MIN_READY=1 NODEPOOL_UBUNTU_BIONIC_MIN_READY=1 NODEPOOL_UBUNTU_TRUSTY_MIN_READY=1 NODEPOOL_UBUNTU_XENIAL_MIN_READY=1 @@ -216,8 +216,8 @@ EOF if $NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB ; then NODEPOOL_DEBIAN_STRETCH_MIN_READY=0 fi - if $NODEPOOL_PAUSE_FEDORA_28_DIB ; then - NODEPOOL_FEDORA_28_MIN_READY=0 + if $NODEPOOL_PAUSE_FEDORA_29_DIB ; then + NODEPOOL_FEDORA_29_MIN_READY=0 fi if $NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB ; then NODEPOOL_UBUNTU_BIONIC_MIN_READY=0 @@ -257,8 +257,8 @@ labels: min-ready: $NODEPOOL_CENTOS_7_MIN_READY - name: debian-stretch min-ready: $NODEPOOL_DEBIAN_STRETCH_MIN_READY - - name: fedora-28 - min-ready: $NODEPOOL_FEDORA_28_MIN_READY + - name: fedora-29 + min-ready: $NODEPOOL_FEDORA_29_MIN_READY - name: ubuntu-bionic min-ready: $NODEPOOL_UBUNTU_BIONIC_MIN_READY - name: ubuntu-trusty @@ -287,7 +287,7 @@ providers: config-drive: true - name: debian-stretch config-drive: true - - name: fedora-28 + - name: fedora-29 config-drive: true - name: ubuntu-bionic config-drive: true @@ -323,8 +323,8 @@ providers: key-name: $NODEPOOL_KEY_NAME instance-properties: nodepool_devstack: testing - - name: fedora-28 - diskimage: fedora-28 + - name: fedora-29 + diskimage: fedora-29 min-ram: 1024 flavor-name: 'nodepool' console-log: True @@ -411,6 +411,7 @@ diskimages: $DIB_GLEAN_INSTALLTYPE $DIB_GLEAN_REPOLOCATION $DIB_GLEAN_REPOREF + DIB_SIMPLE_INIT_NETWORKMANAGER: '1' - name: debian-stretch pause: $NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB rebuild-age: 86400 @@ -438,8 +439,8 @@ diskimages: $DIB_GLEAN_INSTALLTYPE $DIB_GLEAN_REPOLOCATION $DIB_GLEAN_REPOREF - - name: fedora-28 - pause: $NODEPOOL_PAUSE_FEDORA_28_DIB + - name: fedora-29 + pause: $NODEPOOL_PAUSE_FEDORA_29_DIB rebuild-age: 86400 elements: - fedora-minimal @@ -449,7 +450,7 @@ diskimages: - devuser - openssh-server - nodepool-setup - release: 28 + release: 29 env-vars: TMPDIR: $NODEPOOL_DIB_BASE_PATH/tmp DIB_CHECKSUM: '1' @@ -460,6 +461,7 @@ diskimages: $DIB_GLEAN_INSTALLTYPE $DIB_GLEAN_REPOLOCATION $DIB_GLEAN_REPOREF + DIB_SIMPLE_INIT_NETWORKMANAGER: '1' - name: ubuntu-bionic pause: $NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB rebuild-age: 86400 diff --git a/devstack/settings b/devstack/settings index 995722625..1308aa1e9 100644 --- a/devstack/settings +++ b/devstack/settings @@ -8,7 +8,7 @@ NODEPOOL_DIB_BASE_PATH=/opt/dib # change the defaults. NODEPOOL_PAUSE_CENTOS_7_DIB=${NODEPOOL_PAUSE_CENTOS_7_DIB:-true} NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB=${NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB:-true} -NODEPOOL_PAUSE_FEDORA_28_DIB=${NODEPOOL_PAUSE_FEDORA_28_DIB:-true} +NODEPOOL_PAUSE_FEDORA_29_DIB=${NODEPOOL_PAUSE_FEDORA_29_DIB:-true} NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB=${NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB:-true} NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=${NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB:-true} NODEPOOL_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 eaa8b194d..6f7a05d3c 100755 --- a/tools/check_devstack_plugin.sh +++ b/tools/check_devstack_plugin.sh @@ -21,7 +21,7 @@ else fi NODEPOOL_PAUSE_CENTOS_7_DIB=${NODEPOOL_PAUSE_CENTOS_7_DIB:-True} NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB=${NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB:-True} -NODEPOOL_PAUSE_FEDORA_28_DIB=${NODEPOOL_PAUSE_FEDORA_28_DIB:-True} +NODEPOOL_PAUSE_FEDORA_29_DIB=${NODEPOOL_PAUSE_FEDORA_29_DIB:-True} NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB=${NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB:-True} NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=${NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB:-True} NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=${NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB:-True} @@ -61,6 +61,23 @@ function sshintonode { fi } +function checknm { + name=$1 + state='ready' + + node=`$NODEPOOL list | grep $name | grep $state | cut -d '|' -f6 | tr -d ' '` + nm_output=$(/tmp/ssh_wrapper $node -- nmcli c) + + # virtio device is eth0 on older, ens3 on newer + if [[ ! ${nm_output} =~ (eth0|ens3) ]]; then + echo "*** Failed to find interface in NetworkManager connections" + /tmp/ssh_wrapper $node -- nmcli c + /tmp/ssh_wrapper $node -- nmcli device + FAILURE_REASON="Failed to find interface in NetworkManager connections" + RETURN=1 + fi +} + function waitforimage { local name=$1 local state='ready' @@ -97,6 +114,8 @@ if [ ${NODEPOOL_PAUSE_CENTOS_7_DIB,,} = 'false' ]; then waitfornode centos-7 # check ssh for root user sshintonode centos-7 + # networkmanager check + checknm centos-7 fi if [ ${NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB,,} = 'false' ]; then @@ -108,13 +127,15 @@ if [ ${NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB,,} = 'false' ]; then sshintonode debian-stretch fi -if [ ${NODEPOOL_PAUSE_FEDORA_28_DIB,,} = 'false' ]; then +if [ ${NODEPOOL_PAUSE_FEDORA_29_DIB,,} = 'false' ]; then # check that image built - waitforimage fedora-28 + waitforimage fedora-29 # check image was bootable - waitfornode fedora-28 + waitfornode fedora-29 # check ssh for root user - sshintonode fedora-28 + sshintonode fedora-29 + # networkmanager check + checknm fedora-29 fi if [ ${NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB,,} = 'false' ]; then