From 71c9c3eeb7ca6c1ba10b696081d5343bb554f311 Mon Sep 17 00:00:00 2001
From: Artom Lifshitz <alifshit@redhat.com>
Date: Fri, 28 Jun 2024 12:41:28 -0400
Subject: [PATCH] Swtich to Ubuntu Noble image

Besides it being just a good thing to move to the latest LTS, this
also resolved an issue in different behaviour in libvirt versions for
watchdog devices. The q35 machine type always includes an implicit
watchdog device, but that device didn't start showing up in the XML
and having configurable actions until 9.1.0. On Jammy, the libvirt
version is 8.0.0, but in downstream RHOSO 18 CI on RHEL 9.4, the
version is 10.0.0. Moving to Noble unifies the libvirt versions, and
makes the watchdog testing less complicated.

Changes necessary to make this work:

* Start installing crudini with `package` instead of `pip` - new `pip`
  complains about the externally managed environment, and tells us to
  either use pipx to install in a venv, pass --break-system-packages,
  or install using system packages. Let's try the latter.

* Start running our local download job on changes to .zuul.yaml as
  well.

* Disable the br-ex-tcpdump service. It appears to only be useful for
  debugging, and it's crashing on the compute host with Noble. Just
  disable it for now.

Change-Id: I538f900953be2304baf8f63693699651fe763402
---
 .zuul.yaml                  | 9 +++++++--
 playbooks/whitebox/pre.yaml | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index d98a4d60..8e3f2d58 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -2,13 +2,13 @@
     name: nested-virt-multinode
     nodes:
       - name: controller
-        label: nested-virt-ubuntu-jammy
+        label: nested-virt-ubuntu-noble
         # NOTE(artom) We can't name the node 'compute' because that seems to
         # take precedence over the 'compute' group in playbooks, so things we
         # want to run on all hosts in the 'compute' group would only run on the
         # subnode.
       - name: compute-host
-        label: nested-virt-ubuntu-jammy
+        label: nested-virt-ubuntu-noble
     groups:
       # Node where tests are executed and test results collected
       - name: tempest
@@ -55,6 +55,8 @@
       extra_packages: ovmf,swtpm-tools
       tempest_exclude_regex: ^whitebox_tempest_plugin\.api\.compute\.test_hugepages
       compute_node_template_name: whitebox-devstack-multinode.yaml.j2
+      devstack_services:
+        br-ex-tcpdump: false
       devstack_localrc:
         MAX_COMPUTE_NODES: 2
         NOVA_SERVICE_REPORT_INTERVAL: 10
@@ -94,6 +96,8 @@
               swtpm_group: swtpm
     group-vars:
       subnode:
+        devstack_services:
+          br-ex-tcpdump: false
         devstack_localrc:
           LIBVIRT_TYPE: kvm
           NOVA_SERVICE_REPORT_INTERVAL: 10
@@ -151,6 +155,7 @@
     pre-run: playbooks/whitebox/pre.yaml
     files:
       - whitebox_tempest_plugin/api/compute/test_rbd_direct_download.py$
+      - .zuul.yaml$
     vars:
       tox_envlist: all
       tempest_concurrency: 1
diff --git a/playbooks/whitebox/pre.yaml b/playbooks/whitebox/pre.yaml
index a83fce48..093821cc 100644
--- a/playbooks/whitebox/pre.yaml
+++ b/playbooks/whitebox/pre.yaml
@@ -4,7 +4,7 @@
 
   tasks:
     - name: crudini
-      pip:
+      package:
           name: crudini
           state: present
       become: yes