Merge pull request #558 from stackhpc/upstream/2025.1-2026-05-04

Synchronise 2025.1 with upstream

Author: Alex-Welsh

roles/kayobe-ci-prep/tasks/main.yml

@@ -1,4 +1,14 @@
 ---
+- name: Configure secondary storage drive
+  #NOTE(wszumski) Some instances provide a smaller 40G root disk with a
+  #secondary storage drive. This kolla-ansible provided role sets up the
+  #secondary drive for docker/podman storage.
+  # see: https://docs.opendev.org/opendev/infra-manual/latest/testing.html#unprivileged-single-use-vms
+  include_role:
+    name: configure-ephemeral
+  vars:
+    configure_ephemeral_mountpoint: "{{ '/var/lib/containers' if container_engine | default('docker') == 'podman' else '/var/lib/docker' }}"
+
 - name: Set Rocky Linux mirror to download.rockylinux.org
   become: true
   ansible.builtin.shell:

roles/kayobe-diagnostics/files/get_logs.sh

@@ -114,6 +114,8 @@ copy_logs() {
 
     iptables-save > ${LOG_DIR}/system_logs/iptables.txt
 
+    lsblk | tee ${LOG_DIR}/system_logs/lsblk.txt
+
     if [ `command -v dpkg` ]; then
         dpkg -l > ${LOG_DIR}/system_logs/dpkg-l.txt
     fi

zuul.d/jobs.yaml

@@ -109,6 +109,8 @@
       tls_enabled: false
       container_engine: 'docker'
       ironic_boot_mode: "bios"
+    roles:
+      - zuul: openstack/kolla
 
 - job:
     name: kayobe-overcloud-base