Skip to content

Commit 2cc4891

Browse files
committed
[os_must_gather] Make SOS_DECOMPRESS configurable
Expose SOS_DECOMPRESS as `cifmw_os_must_gather_sos_decompress` with a default of 1 so that SOS reports from both OCP and EDPM nodes are decompressed after collection, making them directly readable without extra steps. This keep the original behavior and adapts cifmw to the recent changes introduced to openstack-must-gather. Signed-off-by: Francesco Pantano <fpantano@redhat.com>
1 parent 8b22a75 commit 2cc4891

3 files changed

Lines changed: 3 additions & 1 deletion

File tree

roles/os_must_gather/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ testing the new changes.
1717
* `cifmw_os_must_gather_namespaces`: (List) List of namespaces required by the gather task in case of failure
1818
* `cifmw_os_must_gather_additional_namespaces`: (String) List of comma separated additional namespaces. Defaults to `kuttl,openshift-storage,sushy-emulator`
1919
* `cifmw_os_must_gather_volume_percentage`: (int) Specify maximum percentage of must-gather pod's allocated volume that can be used. If this limit is exceeded, must-gather will stop gathering, but still copy gathered data. Defaults to `80`
20+
* `cifmw_os_must_gather_sos_decompress`: (int) Controls whether SOS reports collected from both OCP and EDPM nodes are decompressed after gathering. Set to `1` to decompress (default), or `0` to keep them compressed. Decompressing makes the reports directly readable (useful for CI purposes) but increases usage. Defaults to `1`
2021
* `cifmw_os_must_gather_omc`: (bool) Enables the full gathering method. When set to false, a lightweight mode is used; when true, it performs a comprehensive data collection, which is more resource-intensive. Defaults to `false`
2122

2223
## Examples

roles/os_must_gather/defaults/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ cifmw_os_must_gather_repo_path: "{{ ansible_user_dir }}/src/github.com/openstack
2626
cifmw_os_must_gather_sos_edpm: "all"
2727
cifmw_os_must_gather_timeout: "30m"
2828
cifmw_os_must_gather_volume_percentage: 80
29+
cifmw_os_must_gather_sos_decompress: 1
2930
cifmw_os_must_gather_additional_namespaces: "kuttl,openshift-storage,openshift-marketplace,openshift-operators,sushy-emulator,tobiko"
3031
cifmw_os_must_gather_namespaces:
3132
- "{{ operator_namespace }}"

roles/os_must_gather/tasks/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
KUBECONFIG: "{{ cifmw_openshift_kubeconfig | default(cifmw_os_must_gather_kubeconfig) }}"
6363
PATH: "{{ cifmw_path }}"
6464
SOS_EDPM: "{{ cifmw_os_must_gather_sos_edpm }}"
65-
SOS_DECOMPRESS: "0"
65+
SOS_DECOMPRESS: "{{ cifmw_os_must_gather_sos_decompress }}"
6666
OPENSTACK_DATABASES: "{{ cifmw_os_must_gather_dump_db }}"
6767
OMC: "{{ cifmw_os_must_gather_omc }}"
6868
cifmw.general.ci_script:

0 commit comments

Comments
 (0)