fix: solving some issues in the must gather tests

Author: CFSNM

ods_ci/tests/Resources/CLI/MustGather/MustGather.resource

@@ -12,21 +12,21 @@ Get must-gather Logs
     ${output}=    Run process    tests/Resources/CLI/MustGather/get-must-gather-logs.sh     shell=yes
     Should Be Equal As Integers	  ${output.rc}	 0
     Should Not Contain    ${output.stdout}    FAIL
-    ${must-gather-dir}=  Run     ls -d must-gather.local.*
-    ${namespaces-log-dir}=      Run     ls -d ${must-gather-dir}/quay-io-modh-must-gather-sha256-*/namespaces
-    Set Suite Variable      ${must-gather-dir}
-    Set Suite Variable      ${namespaces-log-dir}
-    Directory Should Exist    ${must-gather-dir}
-    Directory Should Not Be Empty   ${must-gather-dir}
+    ${must_gather_dir}=  Run     ls -d must-gather.local.*
+    ${namespaces_log_dir}=      Run     ls -d ${must_gather_dir}/quay-io-modh-must-gather-sha256-*/namespaces
+    Set Suite Variable      ${must_gather_dir}
+    Set Suite Variable      ${namespaces_log_dir}
+    Directory Should Exist    ${must_gather_dir}
+    Directory Should Not Be Empty   ${must_gather_dir}
 
 Verify Logs For ${namespace}
     [Documentation]    Verifies the must-gather logs related to a namespace
-    Directory Should Exist    ${namespaces-log-dir}/${namespace}
-    Directory Should Not Be Empty    ${namespaces-log-dir}/${namespace}
-    Directory Should Not Be Empty    ${namespaces-log-dir}/${namespace}/pods
-    ${log-files}=     Run   find ${namespaces-log-dir}/${namespace}/pods -type f -name "*.log"
-    Should Not Be Equal    ${log-files}  ${EMPTY}
+    Directory Should Exist    ${namespaces_log_dir}/${namespace}
+    Directory Should Not Be Empty    ${namespaces_log_dir}/${namespace}
+    Directory Should Not Be Empty    ${namespaces_log_dir}/${namespace}/pods
+    ${log_files}=     Run   find ${namespaces_log_dir}/${namespace}/pods -type f -name "*.log"
+    Should Not Be Equal    ${log_files}  ${EMPTY}
 
 Cleanup must-gather Logs
     [Documentation]    Deletes the folder with the must-gather logs
-    Remove Directory   ${must-gather-dir}    recursive=True
+    Run Keyword If      "${must_gather_dir}" != "${EMPTY}"      Remove Directory   ${must_gather_dir}    recursive=True

ods_ci/tests/Resources/CLI/MustGather/get-must-gather-logs.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 # Redirecting stdout/stderr of must-gather to a file, as it fills up the
 # process buffer and prevents the script from running further.
-oc adm must-gather --image=quay.io/modh/must-gather@sha256:1bd8735d715b624c1eaf484454b0d6d400a334d8cbba47f99883626f36e96657 &> must-gather-results.txt
+oc adm must-gather --image=quay.io/modh/must-gather@sha256:9d5988f45c3b00ec7fbbe7a8a86cc149a2768c9c47e207694fdb6e87ef44adf3 &> must-gather-results.txt
 
 if [ $? -eq 0 ]
 then