Skip to content

Commit 379fcff

Browse files
committed
Merge remote-tracking branch 'origin/stackhpc/2024.1' into sot-rename
2 parents 5010aa0 + 082e447 commit 379fcff

File tree

4 files changed

+8
-2
lines changed

4 files changed

+8
-2
lines changed

.github/path-filters.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ aio: &aio
1111
- '.github/workflows/stackhpc-pull-request.yml'
1212
- 'etc/kayobe/*.yml'
1313
- 'etc/kayobe/ansible/configure-aio-resources.yml'
14+
- 'etc/kayobe/ansible/stackhpc-openstack-tests.yml'
1415
- 'etc/kayobe/ansible/growroot.yml'
1516
- 'etc/kayobe/ansible/requirements.yml'
1617
- 'etc/kayobe/ansible/scripts/aio-init.sh'

etc/kayobe/ansible/stackhpc-cloud-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
--self-contained-html
6969
--pyargs stackhpc_cloud_tests
7070
--timeout {{ sct_timeout }}
71-
-r
71+
-rfEx
7272
-vv
7373
environment:
7474
OPENSEARCH_HOSTS: "{{ sct_opensearch_hosts }}"

etc/kayobe/ipa.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ image_download_unredirected_headers:
126126
#ipa_collectors_default:
127127

128128
# List of additional inspection collectors to run.
129-
ipa_collectors_extra: "{{ ['dmi-decode', 'extra-hardware', 'numa-topology'] if ipa_build_images else [] }}"
129+
ipa_collectors_extra: "{{ ['dmi-decode', 'extra-hardware', 'numa-topology'] if ipa_build_images or stackhpc_ipa_image_overcloud_enabled else [] }}"
130130

131131
# List of inspection collectors to run.
132132
#ipa_collectors:
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
fixes:
3+
- |
4+
Restores the use of extra IPA collectors (including ``extra-hardware``)
5+
when using StackHPC IPA images.

0 commit comments

Comments
 (0)