From 443cbfb41852cc748c10974a54b6203434d350ae Mon Sep 17 00:00:00 2001
From: Eduardo Olivares <eolivare@redhat.com>
Date: Thu, 19 Jun 2025 11:41:01 +0200
Subject: [PATCH] Replace nested-virt-ubuntu-jammy with
 nested-virt-ubuntu-noble nodes

ubuntu noble doesn't allow to install python packages at system level,
so the devstack venv should be used.

devstack-tobiko-functional voting is disabled because some tests
related to processes fail on noble.

Depends-On: I2e7cf080ba0998be65614e79d4cf67357af1b27d

Change-Id: Ibeb8cab99ddb1cd7e926a37564f418636e4ea91c
---
 zuul.d/devstack-tobiko-functional.yaml |  2 +-
 zuul.d/devstack-tobiko-minimal.yaml    |  9 ++++++++-
 zuul.d/devstack-tobiko.yaml            |  9 ++++++++-
 zuul.d/nodesets.yaml                   | 11 +++++------
 4 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/zuul.d/devstack-tobiko-functional.yaml b/zuul.d/devstack-tobiko-functional.yaml
index ab8cf1e..bc0a933 100644
--- a/zuul.d/devstack-tobiko-functional.yaml
+++ b/zuul.d/devstack-tobiko-functional.yaml
@@ -16,7 +16,7 @@
     abstract: false
     name: devstack-tobiko-functional
     parent: devstack-tobiko
-    voting: true
+    voting: false
     description: Run tobiko functional test cases
     vars:
       test_workflow: functional
diff --git a/zuul.d/devstack-tobiko-minimal.yaml b/zuul.d/devstack-tobiko-minimal.yaml
index bea3181..be4778b 100644
--- a/zuul.d/devstack-tobiko-minimal.yaml
+++ b/zuul.d/devstack-tobiko-minimal.yaml
@@ -17,7 +17,7 @@
     abstract: false
     name: devstack-tobiko-minimal
     parent: devstack
-    nodeset: devstack-tobiko-jammy
+    nodeset: devstack-tobiko-noble
     voting: true
     branches:
       regex: ^(unmaintained|stable/(wallaby|xena|yoga|zed|2023.1)).*$
@@ -72,6 +72,13 @@
       test_log_debug: true
       test_case_timeout: 1800
       test_workflow: faults
+      python_exe_dirs:
+        - /opt/stack/data/venv/bin
+        - /opt/stack/bindep-venv/bin
+        - ~/.local/bin
+        - ~/bin
+        - /usr/local/bin
+        - /usr/bin
     pre-run: playbooks/devstack/pre.yaml
     run: playbooks/devstack/run.yaml
     post-run: playbooks/devstack/post.yaml
diff --git a/zuul.d/devstack-tobiko.yaml b/zuul.d/devstack-tobiko.yaml
index 4be7f3b..3004f05 100644
--- a/zuul.d/devstack-tobiko.yaml
+++ b/zuul.d/devstack-tobiko.yaml
@@ -20,7 +20,7 @@
     abstract: false
     name: devstack-tobiko
     parent: devstack
-    nodeset: devstack-tobiko-jammy
+    nodeset: devstack-tobiko-noble
     voting: true
     branches:
       regex: ^(unmaintained|stable/(wallaby|xena|yoga|zed|2023.1)).*$
@@ -117,6 +117,13 @@
       test_log_debug: true
       test_case_timeout: 1800
       test_workflow: faults
+      python_exe_dirs:
+        - /opt/stack/data/venv/bin
+        - /opt/stack/bindep-venv/bin
+        - ~/.local/bin
+        - ~/bin
+        - /usr/local/bin
+        - /usr/bin
     pre-run: playbooks/devstack/pre.yaml
     run: playbooks/devstack/run.yaml
     post-run: playbooks/devstack/post.yaml
diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml
index 2348544..87c0dbd 100644
--- a/zuul.d/nodesets.yaml
+++ b/zuul.d/nodesets.yaml
@@ -12,11 +12,10 @@
 
 
 - nodeset:
-    name: devstack-tobiko-jammy
+    name: devstack-tobiko-noble
     nodes:
       - name: controller
-        # label: ubuntu-jammy
-        label: nested-virt-ubuntu-jammy
+        label: nested-virt-ubuntu-noble
     groups: *STANDALONE_GROUPS
 
 
@@ -26,11 +25,11 @@
     name: devstack-tobiko-multinode
     nodes:
       - name: controller
-        label: nested-virt-ubuntu-jammy
+        label: nested-virt-ubuntu-noble
       - name: compute1
-        label: nested-virt-ubuntu-jammy
+        label: nested-virt-ubuntu-noble
       - name: compute2
-        label: nested-virt-ubuntu-jammy
+        label: nested-virt-ubuntu-noble
     groups: &MULTINODE_GROUPS
       # Node where tests are executed and test results collected
       - name: tempest