[release-1.33] tests: Bump DevStack to Epoxy (2025.1) (#2955)

k8s-infra-cherrypick-robot · stephenfin · web-flow · commit c33d1c72b2e2 · 2025-08-08T04:37:43.000-07:00
* tests: Suffix image version While boskos will reap most resources for us, it doesn't reap images [1]. This has resulted in us using the same image for who knows how long at this point. Encode the Ubuntu version to prevent us picking up other version by mistake. [1] https://github.com/kubernetes-sigs/boskos/blob/5993cef5a1c719c33c0936d416b7d935058e1204/cmd/janitor/gcp_janitor.py#L46-L88 Signed-off-by: Stephen Finucane <stephenfin@redhat.com> * tests: Bump DevStack to Epoxy (2025.1) Signed-off-by: Stephen Finucane <stephenfin@redhat.com> * tests: Bump amphora image Use the Ubuntu 24.04 version, rather than the 22.04 version. This aligns with what we're using for DevStack itself. Signed-off-by: Stephen Finucane <stephenfin@redhat.com> * devstack: Remove USE_PYTHON3 It's all Python 3 now, baby. Signed-off-by: Stephen Finucane <stephenfin@redhat.com> * tests: Install Ansible from Debian Testing Signed-off-by: Stephen Finucane <stephenfin@redhat.com> * tests: Correct broken conditions Per the Ansible 2.19 porting guide [1]. [1] https://ansible.readthedocs.io/projects/ansible-core/devel/porting_guides/porting_guide_core_2.19.html Signed-off-by: Stephen Finucane <stephenfin@redhat.com> * tests: Decrease device detach timeout Wait less time before retrying. Signed-off-by: Stephen Finucane <stephenfin@redhat.com> --------- Signed-off-by: Stephen Finucane <stephenfin@redhat.com> Co-authored-by: Stephen Finucane <stephenfin@redhat.com>
diff --git a/tests/ci-csi-cinder-e2e.sh b/tests/ci-csi-cinder-e2e.sh
@@ -41,6 +41,24 @@ cleanup() {
 }
 trap cleanup EXIT
 
+# Install Ansible from Trixie (Debian Testing) to allow us to talk to a host
+# running Python 3.12 like Ubuntu 24.04
+#
+# https://woju.eu/blog/2025/03/ansible-bookworm/
+cat << EOF > /etc/apt/sources.list.d/trixie.list
+deb https://deb.debian.org/debian trixie main
+EOF
+
+cat << EOF > /etc/apt/preferences.d/ansible.pref
+Package: *
+Pin: release n=trixie
+Pin-Priority: -10
+
+Package: ansible* python3-netaddr
+Pin: release n=trixie
+Pin-Priority: 990
+EOF
+
 apt-get update
 apt-get install -y python3-requests ansible
 
diff --git a/tests/ci-csi-manila-e2e.sh b/tests/ci-csi-manila-e2e.sh
@@ -41,6 +41,24 @@ cleanup() {
 }
 trap cleanup EXIT
 
+# Install Ansible from Trixie (Debian Testing) to allow us to talk to a host
+# running Python 3.12 like Ubuntu 24.04
+#
+# https://woju.eu/blog/2025/03/ansible-bookworm/
+cat << EOF > /etc/apt/sources.list.d/trixie.list
+deb https://deb.debian.org/debian trixie main
+EOF
+
+cat << EOF > /etc/apt/preferences.d/ansible.pref
+Package: *
+Pin: release n=trixie
+Pin-Priority: -10
+
+Package: ansible* python3-netaddr
+Pin: release n=trixie
+Pin-Priority: 990
+EOF
+
 apt-get update
 apt-get install -y python3-requests ansible
 
diff --git a/tests/ci-occm-e2e.sh b/tests/ci-occm-e2e.sh
@@ -42,6 +42,24 @@ cleanup() {
 }
 trap cleanup EXIT
 
+# Install Ansible from Trixie (Debian Testing) to allow us to talk to a host
+# running Python 3.12 like Ubuntu 24.04
+#
+# https://woju.eu/blog/2025/03/ansible-bookworm/
+cat << EOF > /etc/apt/sources.list.d/trixie.list
+deb https://deb.debian.org/debian trixie main
+EOF
+
+cat << EOF > /etc/apt/preferences.d/ansible.pref
+Package: *
+Pin: release n=trixie
+Pin-Priority: -10
+
+Package: ansible* python3-netaddr
+Pin: release n=trixie
+Pin-Priority: 990
+EOF
+
 apt-get update
 apt-get install -y python3-requests ansible
 
@@ -133,4 +151,4 @@ scp -i ~/.ssh/google_compute_engine \
 # If Boskos is being used then release the resource back to Boskos.
 [ -z "${BOSKOS_HOST:-}" ] || python3 tests/scripts/boskos.py --release >> "$ARTIFACTS/logs/boskos.log" 2>&1
 
-exit ${exit_code}
+exit ${exit_code}
diff --git a/tests/playbooks/roles/install-cpo-occm/tasks/main.yaml b/tests/playbooks/roles/install-cpo-occm/tasks/main.yaml
@@ -128,7 +128,7 @@
         msg: *failmsg
 
 - name: Run functional tests for openstack-cloud-controller-manager
-  when: run_e2e
+  when: run_e2e | bool
   register: run_tests
   shell:
     executable: /bin/bash
@@ -145,7 +145,7 @@
 
 - name: Print logs for debugging
   when:
-    - run_e2e
+    - run_e2e | bool
     - run_tests.failed
   block:
   - name: Show openstack-cloud-controller-manager pod logs
diff --git a/tests/playbooks/roles/install-devstack/defaults/main.yaml b/tests/playbooks/roles/install-devstack/defaults/main.yaml
@@ -1,7 +1,7 @@
 ---
 user: "stack"
 workdir: "/home/{{ user }}/devstack"
-branch: "2023.2-eol"
+branch: "stable/2025.1"
 enable_services:
   - nova
   - glance
@@ -10,6 +10,6 @@ enable_services:
   - octavia
   - ovn-octavia
   - barbican
-octavia_amphora_url: "https://tarballs.opendev.org/openstack/octavia/test-images/test-only-amphora-x64-haproxy-ubuntu-jammy.qcow2"
+octavia_amphora_url: "https://tarballs.opendev.org/openstack/octavia/test-images/test-only-amphora-x64-haproxy-ubuntu-noble.qcow2"
 octavia_amphora_dir: /opt/octavia-amphora
 octavia_amphora_filename: amphora-x64-haproxy.qcow2
diff --git a/tests/playbooks/roles/install-devstack/templates/local.conf.j2 b/tests/playbooks/roles/install-devstack/templates/local.conf.j2
@@ -3,7 +3,6 @@ RECLONE=False
 HOST_IP={{ local_ip_address }}
 DEST=/opt/stack
 DATA_DIR=${DEST}/data
-USE_PYTHON3=True
 LOGFILE=$DEST/logs/stack.sh.log
 VERBOSE=True
 LOG_COLOR=False
@@ -49,6 +48,7 @@ enable_service n-cond
 enable_service n-sch
 enable_service n-api-meta
 
+# Placement
 enable_service placement-api
 enable_service placement-client
 {% endif %}
@@ -148,6 +148,16 @@ if [ -f /opt/stack/data/venv/bin/activate ]; then
     deactivate
 fi
 
+{% if "nova" in enable_services %}
+[[post-config|$NOVA_CONF]]
+[libvirt]
+# Workaround for nova bug #2119114. Until that bug is resolved, Nova will
+# always timeout when detaching volumes (which affects deletion of PVCs)
+#
+# https://bugs.launchpad.net/nova/+bug/2119114
+device_detach_timeout = 1
+{% endif %}
+
 {% if "glance" in enable_services %}
 [[post-config|$GLANCE_API_CONF]]
 [glance_store]
diff --git a/tests/playbooks/test-occm-e2e.yaml b/tests/playbooks/test-occm-e2e.yaml
@@ -25,5 +25,5 @@
     - role: install-k3s
       worker_node_count: 0
     - role: install-cpo-occm
-      run_e2e: "{{ run_e2e }}"
+      run_e2e: "{{ run_e2e | bool }}"
       octavia_provider: "{{ octavia_provider }}"
diff --git a/tests/scripts/create-gce-vm.sh b/tests/scripts/create-gce-vm.sh
@@ -91,17 +91,18 @@ main() {
 
   case "${FLAVOR}" in
   "default")
-    if ! gcloud compute disks describe devstack-${FLAVOR} --zone "${GCP_ZONE}" > /dev/null 2>&1;
+    local disk_name="devstack-${FLAVOR}-ubuntu2404"
+    if ! gcloud compute disks describe "${disk_name}" --zone "${GCP_ZONE}" > /dev/null 2>&1;
     then
-      gcloud compute disks create devstack-${FLAVOR} \
+      gcloud compute disks create "${disk_name}" \
         --image-project ubuntu-os-cloud --image-family ubuntu-2404-lts-amd64 \
         --zone "${GCP_ZONE}"
     fi
 
-    if ! gcloud compute images describe devstack-${FLAVOR} > /dev/null 2>&1;
+    if ! gcloud compute images describe "${disk_name}" > /dev/null 2>&1;
     then
-      gcloud compute images create devstack-${FLAVOR} \
-        --source-disk devstack-${FLAVOR} --source-disk-zone "${GCP_ZONE}" \
+      gcloud compute images create "${disk_name}" \
+        --source-disk "${disk_name}" --source-disk-zone "${GCP_ZONE}" \
         --licenses "https://www.googleapis.com/compute/v1/projects/vm-options/global/licenses/enable-vmx"
     fi
     ;;
@@ -115,7 +116,7 @@ main() {
   then
     gcloud compute instances create devstack \
       --zone "${GCP_ZONE}" \
-      --image devstack-${FLAVOR} \
+      --image "${disk_name}" \
       --boot-disk-size 30G \
       --boot-disk-type pd-ssd \
       --can-ip-forward \
