From ae20d4ee6afd2722a95dcef7cb87869fa875a6a9 Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Wed, 22 Apr 2026 09:40:37 +0100 Subject: [PATCH] [CI] Use kolla-ansible configure-ephemeral role Sometimes we land on a node with a 40G disk. We've seen disk space related failures on the upgrade jobs. Change-Id: I036d95cace1fe2083f669837c99e75e15e576032 Signed-off-by: Will Szumski --- roles/kayobe-ci-prep/tasks/main.yml | 10 ++++++++++ roles/kayobe-diagnostics/files/get_logs.sh | 2 ++ zuul.d/jobs.yaml | 2 ++ 3 files changed, 14 insertions(+) diff --git a/roles/kayobe-ci-prep/tasks/main.yml b/roles/kayobe-ci-prep/tasks/main.yml index c44508217..b3b9c25ad 100644 --- a/roles/kayobe-ci-prep/tasks/main.yml +++ b/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: diff --git a/roles/kayobe-diagnostics/files/get_logs.sh b/roles/kayobe-diagnostics/files/get_logs.sh index 2b2b54964..3fd319f2c 100644 --- a/roles/kayobe-diagnostics/files/get_logs.sh +++ b/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 diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index fcfc2e337..b1ece48f7 100644 --- a/zuul.d/jobs.yaml +++ b/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