From 71eb9df3620dddb935785bcebb7297b5d96f63cf Mon Sep 17 00:00:00 2001 From: Tony Breeds Date: Fri, 20 Jun 2025 12:39:42 +1000 Subject: [PATCH] Remove nodepool based testing The following changes switch to devstack based testing in the impacted projects. Note openstacksdk has several open branches, Depends-On: https://review.opendev.org/c/opendev/glean/+/953163 Depends-On: https://review.opendev.org/c/openstack/openstacksdk/+/953918 Depends-On: https://review.opendev.org/c/openstack/openstacksdk/+/953919 Depends-On: https://review.opendev.org/c/openstack/openstacksdk/+/953920 Depends-On: https://review.opendev.org/c/openstack/openstacksdk/+/953921 Depends-On: https://review.opendev.org/c/openstack/openstacksdk/+/953922 Depends-On: https://review.opendev.org/c/openstack/openstacksdk/+/953923 Change-Id: I4f5e10e63d51fee6c4ca9afb829b515f67bce71e Signed-off-by: Tony Breeds --- .zuul.d/jobs.yaml | 257 ------------------ .../dib-nodepool/collect-openstack-logs.yaml | 21 -- playbooks/dib-nodepool/files/cpu-level.sh | 34 --- playbooks/dib-nodepool/node-information.yaml | 16 -- 4 files changed, 328 deletions(-) delete mode 100644 playbooks/dib-nodepool/collect-openstack-logs.yaml delete mode 100644 playbooks/dib-nodepool/files/cpu-level.sh delete mode 100644 playbooks/dib-nodepool/node-information.yaml diff --git a/.zuul.d/jobs.yaml b/.zuul.d/jobs.yaml index 48b5da2be..0d40fe5c1 100644 --- a/.zuul.d/jobs.yaml +++ b/.zuul.d/jobs.yaml @@ -133,35 +133,6 @@ SWIFT_MAX_FILE_SIZE: 5368709122 # 5G + 2 bytes (swift default) SWIFT_LOOPBACK_DISK_SIZE: "6G" # Alittle more than ^^ -- job: - name: dib-nodepool-functional-src-base - description: | - Base job for DIB functional tests, which build and boot a node - under nodepool, using source versions of dependencies such as - nodepool, dib, openstacksdk and glean. - pre-run: playbooks/dib-nodepool/node-information.yaml - parent: nodepool-functional-container-openstack-siblings-base - post-run: playbooks/dib-nodepool/collect-openstack-logs.yaml - vars: - nodepool_debug: true - irrelevant-files: - - ^.*\.rst$ - - ^doc/.*$ - - ^releasenotes/.*$ - -- job: - name: dib-nodepool-functional-openstack-almalinux-8-containerfile-src - description: | - Test building and booting a AlmaLinux image from a - containerfile with Nodepool and OpenStack (using released - libraries) - parent: dib-nodepool-functional-src-base - vars: - nodepool_debug: true - nodepool_diskimage: - base_element: almalinux-container - release: '8' - - job: name: dib-devstack-functional-openstack-almalinux-8-containerfile-src description: | @@ -173,19 +144,6 @@ base_element: almalinux-container release: '8' -- job: - name: dib-nodepool-functional-openstack-almalinux-9-containerfile-src - description: | - Test building and booting a AlmaLinux image from a - containerfile with Nodepool and OpenStack (using released - libraries) - parent: dib-nodepool-functional-src-base - vars: - nodepool_debug: true - nodepool_diskimage: - base_element: almalinux-container - release: '9' - - job: name: dib-devstack-functional-openstack-almalinux-9-containerfile-src description: | @@ -198,19 +156,6 @@ base_element: almalinux-container release: '9' -- job: - name: dib-nodepool-functional-openstack-centos-8-stream-src - description: | - Test building and booting a Centos 8 Stream image with Nodepool and - OpenStack. - parent: dib-nodepool-functional-src-base - vars: - nodepool_diskimage: - base_element: centos-minimal - release: '8-stream' - # TODO: set when CentOS 8 Stream repos mirrored. - # mirror: "http://{{ zuul_site_mirror_fqdn }}/centos" - - job: name: dib-devstack-functional-openstack-centos-8-stream-src description: | @@ -222,19 +167,6 @@ base_element: centos-minimal release: '8-stream' -- job: - name: dib-nodepool-functional-openstack-centos-9-stream-src - description: | - Test building and booting a Centos 9 Stream image with Nodepool and - OpenStack. - parent: dib-nodepool-functional-src-base - vars: - nodepool_diskimage: - base_element: centos-minimal - release: '9-stream' - # TODO: set when CentOS 9 Stream repos mirrored. - # mirror: "http://{{ zuul_site_mirror_fqdn }}/centos" - - job: name: dib-devstack-functional-openstack-centos-9-stream-src description: | @@ -264,19 +196,6 @@ LIBVIRT_CPU_MODE: custom LIBVIRT_CPU_MODEL: Haswell -- job: - name: dib-nodepool-functional-openstack-fedora-37-containerfile-src - description: | - Test building and booting an Fedora image from a - containerfile with Nodepool and OpenStack (using released - libraries) - parent: dib-nodepool-functional-src-base - vars: - nodepool_debug: true - nodepool_diskimage: - base_element : fedora-container - release: '37' - - job: name: dib-devstack-functional-openstack-fedora-37-containerfile-src description: | @@ -289,19 +208,6 @@ base_element : fedora-container release: '37' -- job: - name: dib-nodepool-functional-openstack-rockylinux-8-containerfile-src - description: | - Test building and booting a Rocky Linux image from a - containerfile with Nodepool and OpenStack (using released - libraries) - parent: dib-nodepool-functional-src-base - vars: - nodepool_debug: true - nodepool_diskimage: - base_element: rocky-container - release: '8' - - job: name: dib-devstack-functional-openstack-rockylinux-8-containerfile-src description: | @@ -314,19 +220,6 @@ base_element: rocky-container release: '8' -- job: - name: dib-nodepool-functional-openstack-rockylinux-9-containerfile-src - description: | - Test building and booting a Rocky Linux image from a - containerfile with Nodepool and OpenStack (using released - libraries) - parent: dib-nodepool-functional-src-base - vars: - nodepool_debug: true - nodepool_diskimage: - base_element: rocky-container - release: '9' - - job: name: dib-devstack-functional-openstack-rockylinux-9-containerfile-src description: | @@ -358,54 +251,6 @@ LIBVIRT_CPU_MODE: custom LIBVIRT_CPU_MODEL: Haswell -- job: - name: dib-nodepool-functional-openstack-ubuntu-xenial-src - description: | - Test building and booting an Ubuntu xenial image with Nodepool - and OpenStack - parent: dib-nodepool-functional-src-base - vars: - nodepool_diskimage: - base_element: ubuntu-minimal - release: 'xenial' - mirror: "http://{{ zuul_site_mirror_fqdn }}/ubuntu" - env-vars: - DIB_APT_LOCAL_CACHE: '0' - DIB_DISABLE_APT_CLEANUP: '1' - DIB_DEBOOTSTRAP_EXTRA_ARGS: '--no-check-gpg' - -- job: - name: dib-nodepool-functional-openstack-ubuntu-bionic-src - description: | - Test building and booting an Ubuntu bionic image with Nodepool - and OpenStack - parent: dib-nodepool-functional-src-base - vars: - nodepool_diskimage: - base_element: ubuntu-minimal - release: 'bionic' - mirror: "http://{{ zuul_site_mirror_fqdn }}/ubuntu" - env-vars: - DIB_APT_LOCAL_CACHE: '0' - DIB_DISABLE_APT_CLEANUP: '1' - DIB_DEBOOTSTRAP_EXTRA_ARGS: '--no-check-gpg' - -- job: - name: dib-nodepool-functional-openstack-ubuntu-focal-src - description: | - Test building and booting an Ubuntu focal image with Nodepool - and OpenStack - parent: dib-nodepool-functional-src-base - vars: - nodepool_diskimage: - base_element: ubuntu-minimal - release: 'focal' - mirror: "http://{{ zuul_site_mirror_fqdn }}/ubuntu" - env-vars: - DIB_APT_LOCAL_CACHE: '0' - DIB_DISABLE_APT_CLEANUP: '1' - DIB_DEBOOTSTRAP_EXTRA_ARGS: '--no-check-gpg' - - job: name: dib-devstack-functional-openstack-ubuntu-focal-src description: | @@ -422,22 +267,6 @@ DIB_DEBOOTSTRAP_EXTRA_ARGS: '--no-check-gpg' DIB_DISTRIBUTION_MIRROR: "http://{{ zuul_site_mirror_fqdn }}/ubuntu" -- job: - name: dib-nodepool-functional-openstack-ubuntu-jammy-src - description: | - Test building and booting an Ubuntu jammy image with Nodepool - and OpenStack - parent: dib-nodepool-functional-src-base - vars: - nodepool_diskimage: - base_element: ubuntu-minimal - release: 'jammy' - mirror: "http://{{ zuul_site_mirror_fqdn }}/ubuntu" - env-vars: - DIB_APT_LOCAL_CACHE: '0' - DIB_DISABLE_APT_CLEANUP: '1' - DIB_DEBOOTSTRAP_EXTRA_ARGS: '--no-check-gpg' - - job: name: dib-devstack-functional-openstack-ubuntu-jammy-src description: | @@ -454,22 +283,6 @@ DIB_DEBOOTSTRAP_EXTRA_ARGS: '--no-check-gpg' DIB_DISTRIBUTION_MIRROR: "http://{{ zuul_site_mirror_fqdn }}/ubuntu" -- job: - name: dib-nodepool-functional-openstack-ubuntu-noble-src - description: | - Test building and booting an Ubuntu noble image with Nodepool - and OpenStack - parent: dib-nodepool-functional-src-base - vars: - nodepool_diskimage: - base_element: ubuntu-minimal - release: 'noble' - # mirror: "http://{{ zuul_site_mirror_fqdn }}/ubuntu" - env-vars: - DIB_APT_LOCAL_CACHE: '0' - DIB_DISABLE_APT_CLEANUP: '1' - DIB_DEBOOTSTRAP_EXTRA_ARGS: '--no-check-gpg' - - job: name: dib-devstack-functional-openstack-ubuntu-noble-src description: | @@ -485,16 +298,6 @@ DIB_DEBOOTSTRAP_EXTRA_ARGS: '--no-check-gpg' DIB_DISTRIBUTION_MIRROR: "http://{{ zuul_site_mirror_fqdn }}/ubuntu" -- job: - name: dib-nodepool-functional-openstack-gentoo-src - description: | - Test building and booting a Gentoo image with Nodepool and OpenStack - parent: dib-nodepool-functional-src-base - vars: - nodepool_diskimage: - base_element: gentoo - release: '' - - job: name: dib-devstack-functional-openstack-gentoo-src description: | @@ -505,22 +308,6 @@ base_element: gentoo release: '' -- job: - name: dib-nodepool-functional-openstack-debian-stretch-src - description: | - Test building and booting a Debian stretch image with Nodepool - and OpenStack - parent: dib-nodepool-functional-src-base - vars: - nodepool_diskimage: - base_element: debian-minimal - release: 'stretch' - mirror: "http://{{ zuul_site_mirror_fqdn }}/debian" - env-vars: - DIB_APT_LOCAL_CACHE: '0' - DIB_DISABLE_APT_CLEANUP: '1' - DIB_DEBOOTSTRAP_EXTRA_ARGS: '--no-check-gpg' - - job: name: dib-devstack-functional-openstack-debian-stretch-src description: | @@ -536,22 +323,6 @@ DIB_DISABLE_APT_CLEANUP: '1' DIB_DEBOOTSTRAP_EXTRA_ARGS: '--no-check-gpg' -- job: - name: dib-nodepool-functional-openstack-debian-bullseye-src - description: | - Test building and booting a Debian bullseye image with Nodepool - and OpenStack - parent: dib-nodepool-functional-src-base - vars: - nodepool_diskimage: - base_element: debian-minimal - release: 'bullseye' - mirror: "http://{{ zuul_site_mirror_fqdn }}/debian" - env-vars: - DIB_APT_LOCAL_CACHE: '0' - DIB_DISABLE_APT_CLEANUP: '1' - DIB_DEBOOTSTRAP_EXTRA_ARGS: '--no-check-gpg' - - job: name: dib-devstack-functional-openstack-debian-bullseye-src description: | @@ -568,22 +339,6 @@ DIB_DEBOOTSTRAP_EXTRA_ARGS: '--no-check-gpg' DIB_DISTRIBUTION_MIRROR: "http://{{ zuul_site_mirror_fqdn }}/debian" -- job: - name: dib-nodepool-functional-openstack-debian-buster-src - description: | - Test building and booting a Debian buster image with Nodepool - and OpenStack - parent: dib-nodepool-functional-src-base - vars: - nodepool_diskimage: - base_element: debian-minimal - release: 'buster' - mirror: "http://{{ zuul_site_mirror_fqdn }}/debian" - env-vars: - DIB_APT_LOCAL_CACHE: '0' - DIB_DISABLE_APT_CLEANUP: '1' - DIB_DEBOOTSTRAP_EXTRA_ARGS: '--no-check-gpg' - - job: name: dib-devstack-functional-openstack-debian-buster-src description: | @@ -599,18 +354,6 @@ DIB_DISABLE_APT_CLEANUP: '1' DIB_DEBOOTSTRAP_EXTRA_ARGS: '--no-check-gpg' -- job: - name: dib-nodepool-functional-openstack-opensuse-15-src - description: | - Test building and booting an openSUSE 15.x image with Nodepool - and OpenStack - parent: dib-nodepool-functional-src-base - vars: - nodepool_diskimage: - base_element: opensuse-minimal - release: '15.2' - mirror: "http://{{ zuul_site_mirror_fqdn }}/opensuse" - - job: name: dib-devstack-functional-openstack-opensuse-15-src description: | diff --git a/playbooks/dib-nodepool/collect-openstack-logs.yaml b/playbooks/dib-nodepool/collect-openstack-logs.yaml deleted file mode 100644 index 2bf319b8e..000000000 --- a/playbooks/dib-nodepool/collect-openstack-logs.yaml +++ /dev/null @@ -1,21 +0,0 @@ -- hosts: all - tasks: - - name: Copy openstack logs - ignore_errors: yes - block: - - name: Make openstack logs dir - become: true - file: - path: /var/log/nodepool/openstack - state: directory - mode: '0755' - - name: Write out openstack logs - become: true - shell: - cmd: | - u="" - name="" - for u in $(systemctl list-unit-files | grep devstack | awk '{print $1}'); do - name=$(echo $u | sed 's/devstack@/screen-/' | sed 's/\.service//') - journalctl -o short-precise --unit $u > /var/log/nodepool/openstack/$name.txt - done diff --git a/playbooks/dib-nodepool/files/cpu-level.sh b/playbooks/dib-nodepool/files/cpu-level.sh deleted file mode 100644 index a6c4c0cf9..000000000 --- a/playbooks/dib-nodepool/files/cpu-level.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env bash - -function report_cpu_flags() { - local flag - - for flag; do - ## Note, it's important to keep a trailing space - case " ${flags} " in - *" ${flag} "*) - echo " ${flag} Found" - ;; - *) - echo " ${flag} NOT Found" - ;; - esac - done -} - -data=$(< /proc/cpuinfo) -flags="" -flags=$(grep "^flags[[:space:]]*:" <<< "${data}" | head -n 1) -flags="${flags#*:}" -flags="${flags## }" - -echo "${flags}" - -echo "x86_64-v1" -report_cpu_flags lm cmov cx8 fpu fxsr mmx syscall sse2 -echo "x86_64-v2" -report_cpu_flags cx16 lahf_lm popcnt sse4_1 sse4_2 ssse3 -echo "x86_64-v3" -report_cpu_flags avx avx2 bmi1 bmi2 f16c fma abm movbe xsave -echo "x86_64-v4" -report_cpu_flags avx512f avx512bw avx512cd avx512dq avx512vl diff --git a/playbooks/dib-nodepool/node-information.yaml b/playbooks/dib-nodepool/node-information.yaml deleted file mode 100644 index b750bd856..000000000 --- a/playbooks/dib-nodepool/node-information.yaml +++ /dev/null @@ -1,16 +0,0 @@ -- hosts: all - tasks: - - name: Copy the cpu-level script into place - copy: - src: cpu-level.sh - dest: /tmp/cpu-level.sh - mode: - - name: Collect CPU flags for node - command: bash /tmp/cpu-level.sh - # NOTE(tonyb): This is interesting as QEMU gains the ability to emuluate - # newer machine types for example 7.2 is needed for haswell. - - name: Collect QEMU version - ignore_errors: true - shell: |- - qemu-kvm --version - qemu-system-$(arch) --version