From c3f9f5a4772c6d729ce334ce7d4e105e97b29105 Mon Sep 17 00:00:00 2001
From: wtripp180901 <will.tripp@btinternet.com>
Date: Tue, 21 Jan 2025 15:52:32 +0000
Subject: [PATCH 1/2] fixed pytest output not specifying options

---
 .github/path-filters.yml                        | 1 +
 etc/kayobe/ansible/stackhpc-openstack-tests.yml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/path-filters.yml b/.github/path-filters.yml
index 02d0ab609..574969c0c 100644
--- a/.github/path-filters.yml
+++ b/.github/path-filters.yml
@@ -11,6 +11,7 @@ aio: &aio
   - '.github/workflows/stackhpc-pull-request.yml'
   - 'etc/kayobe/*.yml'
   - 'etc/kayobe/ansible/configure-aio-resources.yml'
+  - 'etc/kayobe/ansible/stackhpc-openstack-tests.yml'
   - 'etc/kayobe/ansible/growroot.yml'
   - 'etc/kayobe/ansible/requirements.yml'
   - 'etc/kayobe/ansible/scripts/aio-init.sh'
diff --git a/etc/kayobe/ansible/stackhpc-openstack-tests.yml b/etc/kayobe/ansible/stackhpc-openstack-tests.yml
index b80121941..bee884782 100644
--- a/etc/kayobe/ansible/stackhpc-openstack-tests.yml
+++ b/etc/kayobe/ansible/stackhpc-openstack-tests.yml
@@ -68,7 +68,7 @@
               --self-contained-html
               --pyargs stackhpc_cloud_tests
               --timeout {{ sot_timeout }}
-              -r
+              -rfEx
               -vv
           environment:
             OPENSEARCH_HOSTS: "{{ sot_opensearch_hosts }}"

From d6c5af13ec9622bfb0129eb9ad368cd7f8befb5c Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Wed, 22 Jan 2025 14:59:57 +0100
Subject: [PATCH 2/2] Enable extra collectors for StackHPC IPA images

---
 etc/kayobe/ipa.yml                                          | 2 +-
 releasenotes/notes/fix-ipa-collectors-f7afc852d5005282.yaml | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/fix-ipa-collectors-f7afc852d5005282.yaml

diff --git a/etc/kayobe/ipa.yml b/etc/kayobe/ipa.yml
index d25461998..30a1057e6 100644
--- a/etc/kayobe/ipa.yml
+++ b/etc/kayobe/ipa.yml
@@ -126,7 +126,7 @@ image_download_unredirected_headers:
 #ipa_collectors_default:
 
 # List of additional inspection collectors to run.
-ipa_collectors_extra: "{{ ['dmi-decode', 'extra-hardware', 'numa-topology'] if ipa_build_images else [] }}"
+ipa_collectors_extra: "{{ ['dmi-decode', 'extra-hardware', 'numa-topology'] if ipa_build_images or stackhpc_ipa_image_overcloud_enabled else [] }}"
 
 # List of inspection collectors to run.
 #ipa_collectors:
diff --git a/releasenotes/notes/fix-ipa-collectors-f7afc852d5005282.yaml b/releasenotes/notes/fix-ipa-collectors-f7afc852d5005282.yaml
new file mode 100644
index 000000000..57c128f9c
--- /dev/null
+++ b/releasenotes/notes/fix-ipa-collectors-f7afc852d5005282.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Restores the use of extra IPA collectors (including ``extra-hardware``)
+    when using StackHPC IPA images.