Merge remote-tracking branch 'origin/stackhpc/2024.1' into sot-rename

stackhpc · Jan 22, 2025 · 379fcff · 379fcff
2 parents 5010aa0 + 082e447
commit 379fcff
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git 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-cloud-tests.yml b/etc/kayobe/ansible/stackhpc-cloud-tests.yml
@@ -68,7 +68,7 @@
               --self-contained-html
               --pyargs stackhpc_cloud_tests
               --timeout {{ sct_timeout }}
-              -r
+              -rfEx
               -vv
           environment:
             OPENSEARCH_HOSTS: "{{ sct_opensearch_hosts }}"

diff --git 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
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Restores the use of extra IPA collectors (including ``extra-hardware``)
+    when using StackHPC IPA images.