From 4379810a07ad121c925a0aab039a21d316c4ecbf Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Tue, 2 Apr 2019 14:32:37 +1100 Subject: [PATCH] Add Debian Buster boot tests Infra has a mirror for Debian Buster now, add boot tests Depends-On: https://review.openstack.org/649496 Change-Id: Ib1567b2576631c078fe11d0f250aeb4e6f9fa0b3 --- .zuul.yaml | 1 + devstack/plugin.sh | 54 ++++++++++++++++++++++++++++++++++ devstack/settings | 1 + tools/check_devstack_plugin.sh | 12 ++++++++ 4 files changed, 68 insertions(+) diff --git a/.zuul.yaml b/.zuul.yaml index 7c6f3cc6b..9cc5182bc 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -128,6 +128,7 @@ vars: devstack_localrc: NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB: false + NODEPOOL_PAUSE_DEBIAN_BUSTER_DIB: false - job: description: | diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 94effeda9..a8f8abeaf 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -78,6 +78,11 @@ function install_nodepool { install_openstacksdk install_dogpile_cache $NODEPOOL_INSTALL/bin/pbr freeze + + # NOTE(ianw): Hack for debian buster compatible deboostrap + sudo add-apt-repository ppa:openstack-ci-core/debootstrap + sudo apt-get update + sudo apt-get install -y debootstrap } # requires some globals from devstack, which *might* not be stable api @@ -214,6 +219,7 @@ EOF NODEPOOL_CENTOS_7_MIN_READY=1 NODEPOOL_DEBIAN_STRETCH_MIN_READY=1 + NODEPOOL_DEBIAN_BUSTER_MIN_READY=1 NODEPOOL_FEDORA_29_MIN_READY=1 NODEPOOL_UBUNTU_BIONIC_MIN_READY=1 NODEPOOL_UBUNTU_TRUSTY_MIN_READY=1 @@ -229,6 +235,9 @@ EOF if $NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB ; then NODEPOOL_DEBIAN_STRETCH_MIN_READY=0 fi + if $NODEPOOL_PAUSE_DEBIAN_BUSTER_DIB ; then + NODEPOOL_DEBIAN_STRETCH_BUSTER_READY=0 + fi if $NODEPOOL_PAUSE_FEDORA_29_DIB ; then NODEPOOL_FEDORA_29_MIN_READY=0 fi @@ -270,6 +279,8 @@ labels: min-ready: $NODEPOOL_CENTOS_7_MIN_READY - name: debian-stretch min-ready: $NODEPOOL_DEBIAN_STRETCH_MIN_READY + - name: debian-buster + min-ready: $NODEPOOL_DEBIAN_BUSTER_MIN_READY - name: fedora-29 min-ready: $NODEPOOL_FEDORA_29_MIN_READY - name: ubuntu-bionic @@ -300,6 +311,8 @@ providers: config-drive: true - name: debian-stretch config-drive: true + - name: debian-buster + config-drive: true - name: fedora-29 config-drive: true - name: ubuntu-bionic @@ -348,6 +361,20 @@ providers: - content: | testpassed path: /etc/testfile_nodepool_userdata + - name: debian-buster + diskimage: debian-buster + min-ram: 512 + flavor-name: 'nodepool' + console-log: True + key-name: $NODEPOOL_KEY_NAME + instance-properties: + nodepool_devstack: testing + userdata: | + #cloud-config + write_files: + - content: | + testpassed + path: /etc/testfile_nodepool_userdata - name: fedora-29 diskimage: fedora-29 min-ram: 1024 @@ -512,6 +539,33 @@ diskimages: $DIB_GLEAN_INSTALLTYPE $DIB_GLEAN_REPOLOCATION $DIB_GLEAN_REPOREF + - name: debian-buster + pause: $NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB + rebuild-age: 86400 + elements: + - debian-minimal + - vm + - simple-init + - growroot + - devuser + - openssh-server + - nodepool-setup + release: buster + env-vars: + TMPDIR: $NODEPOOL_DIB_BASE_PATH/tmp + DIB_CHECKSUM: '1' + DIB_SHOW_IMAGE_USAGE: '1' + DIB_IMAGE_CACHE: $NODEPOOL_DIB_BASE_PATH/cache + DIB_APT_LOCAL_CACHE: '0' + DIB_DISABLE_APT_CLEANUP: '1' + DIB_DEV_USER_AUTHORIZED_KEYS: $NODEPOOL_PUBKEY + DIB_DEBIAN_COMPONENTS: 'main' + $DIB_DISTRIBUTION_MIRROR_DEBIAN + $DIB_DEBOOTSTRAP_EXTRA_ARGS + $DIB_GET_PIP + $DIB_GLEAN_INSTALLTYPE + $DIB_GLEAN_REPOLOCATION + $DIB_GLEAN_REPOREF - name: fedora-29 pause: $NODEPOOL_PAUSE_FEDORA_29_DIB rebuild-age: 86400 diff --git a/devstack/settings b/devstack/settings index 74473e70a..262b511d4 100644 --- a/devstack/settings +++ b/devstack/settings @@ -8,6 +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_DEBIAN_BUSTER_DIB=${NODEPOOL_PAUSE_DEBIAN_BUSTER_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} diff --git a/tools/check_devstack_plugin.sh b/tools/check_devstack_plugin.sh index db7c80833..32f0e59b8 100755 --- a/tools/check_devstack_plugin.sh +++ b/tools/check_devstack_plugin.sh @@ -21,6 +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_DEBIAN_BUSTER_DIB=${NODEPOOL_PAUSE_DEBIAN_BUSTER_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} @@ -161,6 +162,17 @@ if [ ${NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB,,} = 'false' ]; then showserver debian-stretch fi +if [ ${NODEPOOL_PAUSE_DEBIAN_BUSTER_DIB,,} = 'false' ]; then + # check that image built + waitforimage debian-buster + # check image was bootable + waitfornode debian-buster + # check ssh for root user + sshintonode debian-buster + # userdata check + showserver debian-buster +fi + if [ ${NODEPOOL_PAUSE_FEDORA_29_DIB,,} = 'false' ]; then # check that image built waitforimage fedora-29