From 5130c46dd2835320f58bf9f856f0402317cbd290 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Gull=C3=B3n?= <agullon@redhat.com>
Date: Mon, 22 Sep 2025 11:31:25 +0200
Subject: [PATCH 01/16] reenable again "Router Verify Access Logging
 Configuration Container" RF test

---
 test/scenarios-bootc/releases/el96-lrel@router.sh | 2 --
 test/scenarios/releases/el96-lrel@router.sh       | 2 --
 test/suites/router/router.robot                   | 1 -
 3 files changed, 5 deletions(-)

diff --git a/test/scenarios-bootc/releases/el96-lrel@router.sh b/test/scenarios-bootc/releases/el96-lrel@router.sh
index c7238c7e43..2199b53167 100644
--- a/test/scenarios-bootc/releases/el96-lrel@router.sh
+++ b/test/scenarios-bootc/releases/el96-lrel@router.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-export TEST_EXCLUDES="ushift-6085"
-
 # Sourced from scenario.sh and uses functions defined there.
 
 scenario_create_vms() {
diff --git a/test/scenarios/releases/el96-lrel@router.sh b/test/scenarios/releases/el96-lrel@router.sh
index a1e0b2792a..1ff7298a39 100644
--- a/test/scenarios/releases/el96-lrel@router.sh
+++ b/test/scenarios/releases/el96-lrel@router.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-export TEST_EXCLUDES="ushift-6085"
-
 # Sourced from scenario.sh and uses functions defined there.
 
 scenario_create_vms() {
diff --git a/test/suites/router/router.robot b/test/suites/router/router.robot
index 68e848c55f..2d7553517d 100644
--- a/test/suites/router/router.robot
+++ b/test/suites/router/router.robot
@@ -239,7 +239,6 @@ Router Verify Security Configuration
 
 Router Verify Access Logging Configuration Container
     [Documentation]    Test ingress access logging configuration.
-    [Tags]    ushift-6085
     [Setup]    Run Keywords
     ...    Remove Custom Config
     ...    AND

From b2db1058aea519842597804bdc76cf2c8ddb3af4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Gull=C3=B3n?= <agullon@redhat.com>
Date: Wed, 24 Sep 2025 14:55:36 +0200
Subject: [PATCH 02/16] filter out Disruptive Ginkgo tests

---
 test/scenarios-bootc/releases/el96-lrel@ginkgo-tests.sh | 2 +-
 test/scenarios/releases/el96-lrel@ginkgo-tests.sh       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/scenarios-bootc/releases/el96-lrel@ginkgo-tests.sh b/test/scenarios-bootc/releases/el96-lrel@ginkgo-tests.sh
index 06486c35dd..569286debc 100644
--- a/test/scenarios-bootc/releases/el96-lrel@ginkgo-tests.sh
+++ b/test/scenarios-bootc/releases/el96-lrel@ginkgo-tests.sh
@@ -12,5 +12,5 @@ scenario_remove_vms() {
 }
 
 scenario_run_tests() {
-    run_gingko_tests host1
+    run_gingko_tests host1 "~Disruptive"
 }
diff --git a/test/scenarios/releases/el96-lrel@ginkgo-tests.sh b/test/scenarios/releases/el96-lrel@ginkgo-tests.sh
index cd4b205d23..00ccbd86bb 100644
--- a/test/scenarios/releases/el96-lrel@ginkgo-tests.sh
+++ b/test/scenarios/releases/el96-lrel@ginkgo-tests.sh
@@ -12,5 +12,5 @@ scenario_remove_vms() {
 }
 
 scenario_run_tests() {
-    run_gingko_tests host1
+    run_gingko_tests host1 "~Disruptive"
 }

From f1dc65988639ba93853104365a2327441e0a4a8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Gull=C3=B3n?= <agullon@redhat.com>
Date: Wed, 24 Sep 2025 14:56:11 +0200
Subject: [PATCH 03/16] add timeout for the Ginkgo test suite

---
 test/bin/scenario.sh | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/test/bin/scenario.sh b/test/bin/scenario.sh
index c72ebff7f6..49e66ea809 100755
--- a/test/bin/scenario.sh
+++ b/test/bin/scenario.sh
@@ -1152,8 +1152,21 @@ run_gingko_tests() {
     cat "${case_selected}"
     echo "-----------------------------------------------------"
 
-    # Run the tests and capture output
-    if ! "${GINKGO_TEST_BINARY}" run --timeout 60m --junit-dir="${test_results_dir}" -f "${case_selected}" 2>&1 | tee "${test_results_dir}/test-output.log"; then
+    # Make sure the test execution times out after a predefined period.
+    # The 'timeout' command sends the HUP signal and, if the test does not
+    # exit after 5m, it sends the KILL signal to terminate the process.
+    local timeout_ginkgo="timeout -v --kill-after=5m ${TEST_EXECUTION_TIMEOUT} ${GINKGO_TEST_BINARY}"
+    if [ -t 0 ]; then
+        # Disable timeout for interactive mode when stdin is a terminal.
+        # This is necessary for proper handling of test interruption by user.
+        timeout_ginkgo="${GINKGO_TEST_BINARY}"
+    fi
+
+    # Run the tests and capture output with 10m timeout for every test case
+    if ! "${timeout_ginkgo}" run --timeout 10m --junit-dir="${test_results_dir}" -f "${case_selected}" 2>&1 | tee "${test_results_dir}/test-output.log"; then
+        if [ $? -ge 124 ] ; then
+            record_junit "${vmname}" "run_test_timed_out_${TEST_EXECUTION_TIMEOUT}" "FAILED"
+        fi
         record_junit "${vmname}" "run_gingko_tests" "FAILED"
         return 1
     fi

From 432db32dc0478929238a98ea8cf46e6d4596b8dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Gull=C3=B3n?= <agullon@redhat.com>
Date: Thu, 25 Sep 2025 10:15:12 +0200
Subject: [PATCH 04/16] need to scape tilde char

---
 test/bin/scenario.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/bin/scenario.sh b/test/bin/scenario.sh
index 49e66ea809..0d106780e3 100755
--- a/test/bin/scenario.sh
+++ b/test/bin/scenario.sh
@@ -1139,7 +1139,7 @@ run_gingko_tests() {
         local -r filter_pattern="$1"
         echo "Applying filter: ${filter_pattern}"
         if [[ "${filter_pattern}" == ~* ]]; then
-            sed -i "/${filter_pattern#~}/d" "${case_selected}"
+            sed -i "/${filter_pattern#\~}/d" "${case_selected}"
         else
             sed -i -n "/${filter_pattern}/p" "${case_selected}"
         fi

From 5c2a64405d61722fb20de8494d7cdf7c75fa1ecb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Gull=C3=B3n?= <agullon@redhat.com>
Date: Thu, 25 Sep 2025 18:38:15 +0200
Subject: [PATCH 05/16] fix ginkgo timeout path

---
 test/bin/scenario.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/bin/scenario.sh b/test/bin/scenario.sh
index 0d106780e3..9535f2456f 100755
--- a/test/bin/scenario.sh
+++ b/test/bin/scenario.sh
@@ -1163,7 +1163,7 @@ run_gingko_tests() {
     fi
 
     # Run the tests and capture output with 10m timeout for every test case
-    if ! "${timeout_ginkgo}" run --timeout 10m --junit-dir="${test_results_dir}" -f "${case_selected}" 2>&1 | tee "${test_results_dir}/test-output.log"; then
+    if ! "${timeout_ginkgo} run --timeout 10m --junit-dir=${test_results_dir} -f ${case_selected}" 2>&1 | tee "${test_results_dir}/test-output.log"; then
         if [ $? -ge 124 ] ; then
             record_junit "${vmname}" "run_test_timed_out_${TEST_EXECUTION_TIMEOUT}" "FAILED"
         fi

From d606ea80e01c8c17d80ffdb34070e6e4b0e3fc47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Gull=C3=B3n?= <agullon@redhat.com>
Date: Thu, 25 Sep 2025 20:27:58 +0200
Subject: [PATCH 06/16] add eval to execute the command

---
 test/bin/scenario.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/bin/scenario.sh b/test/bin/scenario.sh
index 9535f2456f..4fe55b28bd 100755
--- a/test/bin/scenario.sh
+++ b/test/bin/scenario.sh
@@ -1159,11 +1159,12 @@ run_gingko_tests() {
     if [ -t 0 ]; then
         # Disable timeout for interactive mode when stdin is a terminal.
         # This is necessary for proper handling of test interruption by user.
+        # shellcheck disable=SC2034
         timeout_ginkgo="${GINKGO_TEST_BINARY}"
     fi
 
     # Run the tests and capture output with 10m timeout for every test case
-    if ! "${timeout_ginkgo} run --timeout 10m --junit-dir=${test_results_dir} -f ${case_selected}" 2>&1 | tee "${test_results_dir}/test-output.log"; then
+    if ! eval '"${timeout_ginkgo}" run --timeout 10m --junit-dir="${test_results_dir}" -f "${case_selected}"' 2>&1 | tee "${test_results_dir}/test-output.log"; then
         if [ $? -ge 124 ] ; then
             record_junit "${vmname}" "run_test_timed_out_${TEST_EXECUTION_TIMEOUT}" "FAILED"
         fi

From c632fcf43e901a584810656787b6f954b44488ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Gull=C3=B3n?= <agullon@redhat.com>
Date: Thu, 25 Sep 2025 23:49:13 +0200
Subject: [PATCH 07/16] remove double quotes

---
 test/bin/scenario.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/bin/scenario.sh b/test/bin/scenario.sh
index 4fe55b28bd..65df50b5a3 100755
--- a/test/bin/scenario.sh
+++ b/test/bin/scenario.sh
@@ -1164,7 +1164,7 @@ run_gingko_tests() {
     fi
 
     # Run the tests and capture output with 10m timeout for every test case
-    if ! eval '"${timeout_ginkgo}" run --timeout 10m --junit-dir="${test_results_dir}" -f "${case_selected}"' 2>&1 | tee "${test_results_dir}/test-output.log"; then
+    if ! eval '${timeout_ginkgo} run --timeout 10m --junit-dir=${test_results_dir} -f ${case_selected}' 2>&1 | tee "${test_results_dir}/test-output.log"; then
         if [ $? -ge 124 ] ; then
             record_junit "${vmname}" "run_test_timed_out_${TEST_EXECUTION_TIMEOUT}" "FAILED"
         fi

From 58be51288343c4674b6f599ccb4d740d9ec540bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Gull=C3=B3n?= <agullon@redhat.com>
Date: Mon, 29 Sep 2025 11:46:51 +0000
Subject: [PATCH 08/16] add script to remove monitor cluster ginkgo test

---
 scripts/fetch_tools.sh |  9 +++++++++
 test/bin/common.sh     |  1 +
 test/bin/scenario.sh   | 31 +++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+)

diff --git a/scripts/fetch_tools.sh b/scripts/fetch_tools.sh
index 717fdbffae..8fdce0120e 100755
--- a/scripts/fetch_tools.sh
+++ b/scripts/fetch_tools.sh
@@ -288,6 +288,15 @@ gettool_ginkgo() {
         popd &>/dev/null
         return 1
     fi
+
+    # Copy handleresult.py to centralized location
+    if [[ -f "${clone_dir}/pipeline/handleresult.py" ]] && [[ -f "${HANDLERESULT_SCRIPT}" ]]; then
+        cp "${clone_dir}/pipeline/handleresult.py" "${HANDLERESULT_SCRIPT}"
+        chmod +x "${HANDLERESULT_SCRIPT}"
+        echo "handleresult.py installed to ${HANDLERESULT_SCRIPT}"
+    else
+        echo "Warning: pipeline/handleresult.py not found in repository"
+    fi
 }
 
 tool_getters=$(declare -F | awk '$3 ~ /^gettool_/ {print $3}' | sed 's/^gettool_//g')
diff --git a/test/bin/common.sh b/test/bin/common.sh
index 2f064cbe47..1886a86010 100644
--- a/test/bin/common.sh
+++ b/test/bin/common.sh
@@ -27,6 +27,7 @@ export IMAGEDIR="${OUTPUTDIR}/test-images"
 
 # Ginkgo test binary path
 export GINKGO_TEST_BINARY="${OUTPUTDIR}/bin/extended-platform-tests"
+export HANDLERESULT_SCRIPT="${OUTPUTDIR}/bin/handleresult.py"
 
 # The storage pool base name for VMs.
 # The actual pool names will be '${VM_POOL_BASENAME}-${SCENARIO}'.
diff --git a/test/bin/scenario.sh b/test/bin/scenario.sh
index 65df50b5a3..4e56d459d4 100755
--- a/test/bin/scenario.sh
+++ b/test/bin/scenario.sh
@@ -1175,9 +1175,40 @@ run_gingko_tests() {
     record_junit "${vmname}" "run_gingko_tests" "OK"
     popd &>/dev/null
 
+    # Clean the JUnit XML files
+    echo "Cleaning JUnit XML files to remove 'Monitor cluster while tests execute' test case"
+    cleanup_success=true
+
+    if [[ ! -f "${HANDLERESULT_SCRIPT}" ]]; then
+        echo "Warning: ${HANDLERESULT_SCRIPT} not found. Skipping XML cleanup."
+    else
+        for junit_file in "${test_results_dir}"/junit_e2e_*.xml; do
+            if [[ -f "${junit_file}" ]]; then
+                filename=$(basename "${junit_file}")
+                echo "Processing: ${filename}"
+                cp "${junit_file}" "${junit_file}.backup"
+                temp_file="${junit_file}.tmp"
+                if "${RF_VENV}"/bin/python3 "${HANDLERESULT_SCRIPT}" -a replace -i "${junit_file}" -o "${temp_file}" 2>/dev/null; then
+                    mv "${temp_file}" "${junit_file}"
+                    echo "Cleaned: ${filename}"
+                    rm "${junit_file}.backup"
+                else
+                    echo "Failed to clean: ${filename} (restored from backup)"
+                    mv "${junit_file}.backup" "${junit_file}"
+                    cleanup_success=false
+                fi
+            fi
+        done
+    fi
+
     # Display results summary
     echo "Gingko test execution completed"
     echo "Results are available in: ${test_results_dir}"
+    if [[ "${cleanup_success}" == "true" ]]; then
+        echo "Unit XML files have been cleaned ('Monitor cluster while tests execute' test case removed)"
+    else
+        echo "Some XML files could not be cleaned (originals preserved)"
+    fi
     if [[ -f "${test_results_dir}/test-output.log" ]]; then
         echo "Test output log: ${test_results_dir}/test-output.log"
     fi

From 335315eb9455d7c3a0947169ea1ad550a3036ec1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Gull=C3=B3n?= <agullon@redhat.com>
Date: Mon, 29 Sep 2025 11:47:52 +0000
Subject: [PATCH 09/16] use `make build` instead of custom `go build` command

---
 scripts/fetch_tools.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/fetch_tools.sh b/scripts/fetch_tools.sh
index 8fdce0120e..e641f32df7 100755
--- a/scripts/fetch_tools.sh
+++ b/scripts/fetch_tools.sh
@@ -275,7 +275,7 @@ gettool_ginkgo() {
     pushd "${clone_dir}" &>/dev/null
 
     local test_binary="./bin/extended-platform-tests"
-    go build -o "${test_binary}" ./cmd/extended-platform-tests
+    make build
 
     # Copy binary to centralized location
     if [[ -f "${test_binary}" ]]; then

From 0c98e903ca894b9848cc9cc7f523bb73c75023ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Gull=C3=B3n?= <agullon@redhat.com>
Date: Mon, 29 Sep 2025 13:47:48 +0000
Subject: [PATCH 10/16] report junit ginkgo status at the end

---
 test/bin/scenario.sh | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/test/bin/scenario.sh b/test/bin/scenario.sh
index 4e56d459d4..35323b9b20 100755
--- a/test/bin/scenario.sh
+++ b/test/bin/scenario.sh
@@ -1164,21 +1164,21 @@ run_gingko_tests() {
     fi
 
     # Run the tests and capture output with 10m timeout for every test case
+    echo "Gingko test execution started"
+    ginkgo_result_success=true
     if ! eval '${timeout_ginkgo} run --timeout 10m --junit-dir=${test_results_dir} -f ${case_selected}' 2>&1 | tee "${test_results_dir}/test-output.log"; then
         if [ $? -ge 124 ] ; then
             record_junit "${vmname}" "run_test_timed_out_${TEST_EXECUTION_TIMEOUT}" "FAILED"
         fi
-        record_junit "${vmname}" "run_gingko_tests" "FAILED"
-        return 1
+        ginkgo_result_success=false
     fi
+    echo "Gingko test execution completed"
 
-    record_junit "${vmname}" "run_gingko_tests" "OK"
     popd &>/dev/null
 
     # Clean the JUnit XML files
     echo "Cleaning JUnit XML files to remove 'Monitor cluster while tests execute' test case"
     cleanup_success=true
-
     if [[ ! -f "${HANDLERESULT_SCRIPT}" ]]; then
         echo "Warning: ${HANDLERESULT_SCRIPT} not found. Skipping XML cleanup."
     else
@@ -1202,7 +1202,6 @@ run_gingko_tests() {
     fi
 
     # Display results summary
-    echo "Gingko test execution completed"
     echo "Results are available in: ${test_results_dir}"
     if [[ "${cleanup_success}" == "true" ]]; then
         echo "Unit XML files have been cleaned ('Monitor cluster while tests execute' test case removed)"
@@ -1212,6 +1211,13 @@ run_gingko_tests() {
     if [[ -f "${test_results_dir}/test-output.log" ]]; then
         echo "Test output log: ${test_results_dir}/test-output.log"
     fi
+
+    # Record the junit result of the ginkgo tests
+    if [[ "${ginkgo_result_success}" == "true" ]]; then
+        record_junit "${vmname}" "run_gingko_tests" "OK"
+    else
+        record_junit "${vmname}" "run_gingko_tests" "FAILED"
+    fi
 }
 
 load_global_settings() {

From 9282839f53463537061fdaceb738e62371374b96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Gull=C3=B3n?= <agullon@redhat.com>
Date: Mon, 29 Sep 2025 14:33:11 +0000
Subject: [PATCH 11/16] add back router changes to be addressed in other PR

---
 test/scenarios-bootc/releases/el96-lrel@router.sh | 2 ++
 test/scenarios/releases/el96-lrel@router.sh       | 2 ++
 test/suites/router/router.robot                   | 1 +
 3 files changed, 5 insertions(+)

diff --git a/test/scenarios-bootc/releases/el96-lrel@router.sh b/test/scenarios-bootc/releases/el96-lrel@router.sh
index e98e710d92..ccc97131f7 100644
--- a/test/scenarios-bootc/releases/el96-lrel@router.sh
+++ b/test/scenarios-bootc/releases/el96-lrel@router.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+export TEST_EXCLUDES="ushift-6085"
+
 # Sourced from scenario.sh and uses functions defined there.
 
 start_image="rhel96-bootc-brew-${LATEST_RELEASE_TYPE}-with-optional"
diff --git a/test/scenarios/releases/el96-lrel@router.sh b/test/scenarios/releases/el96-lrel@router.sh
index 65b67d7f6c..5df1d90db2 100644
--- a/test/scenarios/releases/el96-lrel@router.sh
+++ b/test/scenarios/releases/el96-lrel@router.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+export TEST_EXCLUDES="ushift-6085"
+
 # Sourced from scenario.sh and uses functions defined there.
 
 start_image="rhel-9.6-microshift-brew-optionals-4.${MINOR_VERSION}-${LATEST_RELEASE_TYPE}"
diff --git a/test/suites/router/router.robot b/test/suites/router/router.robot
index 2d7553517d..68e848c55f 100644
--- a/test/suites/router/router.robot
+++ b/test/suites/router/router.robot
@@ -239,6 +239,7 @@ Router Verify Security Configuration
 
 Router Verify Access Logging Configuration Container
     [Documentation]    Test ingress access logging configuration.
+    [Tags]    ushift-6085
     [Setup]    Run Keywords
     ...    Remove Custom Config
     ...    AND

From a3299b36cacabd776c39070a9068465877446a84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Gull=C3=B3n?= <agullon@redhat.com>
Date: Mon, 29 Sep 2025 14:48:42 +0000
Subject: [PATCH 12/16] manual merge from #5537 PR

---
 scripts/fetch_tools.sh |  2 +-
 test/bin/scenario.sh   | 25 ++++++++++++++++---------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/scripts/fetch_tools.sh b/scripts/fetch_tools.sh
index 55d4fb3de9..aabdc9ac5e 100755
--- a/scripts/fetch_tools.sh
+++ b/scripts/fetch_tools.sh
@@ -305,7 +305,7 @@ gettool_ginkgo() {
         return 1
     fi
 
-    # Copy handleresult.py to centralized location
+    # Copy handleresult.py to the tools directory
     if [[ -f "${clone_dir}/pipeline/handleresult.py" ]] && [[ -f "${HANDLERESULT_SCRIPT}" ]]; then
         cp "${clone_dir}/pipeline/handleresult.py" "${HANDLERESULT_SCRIPT}"
         chmod +x "${HANDLERESULT_SCRIPT}"
diff --git a/test/bin/scenario.sh b/test/bin/scenario.sh
index 35323b9b20..a24044f2b2 100755
--- a/test/bin/scenario.sh
+++ b/test/bin/scenario.sh
@@ -1164,7 +1164,7 @@ run_gingko_tests() {
     fi
 
     # Run the tests and capture output with 10m timeout for every test case
-    echo "Gingko test execution started"
+    echo "Gingko test execution started..."
     ginkgo_result_success=true
     if ! eval '${timeout_ginkgo} run --timeout 10m --junit-dir=${test_results_dir} -f ${case_selected}' 2>&1 | tee "${test_results_dir}/test-output.log"; then
         if [ $? -ge 124 ] ; then
@@ -1173,6 +1173,9 @@ run_gingko_tests() {
         ginkgo_result_success=false
     fi
     echo "Gingko test execution completed"
+    if [[ -f "${test_results_dir}/test-output.log" ]]; then
+        echo "Test output log: ${test_results_dir}/test-output.log"
+    fi
 
     popd &>/dev/null
 
@@ -1186,15 +1189,19 @@ run_gingko_tests() {
             if [[ -f "${junit_file}" ]]; then
                 filename=$(basename "${junit_file}")
                 echo "Processing: ${filename}"
+
+                # Create backup
                 cp "${junit_file}" "${junit_file}.backup"
+
+                # Clean the XML
                 temp_file="${junit_file}.tmp"
-                if "${RF_VENV}"/bin/python3 "${HANDLERESULT_SCRIPT}" -a replace -i "${junit_file}" -o "${temp_file}" 2>/dev/null; then
+                if python3 "${HANDLERESULT_SCRIPT}" -a replace -i "${junit_file}" -o "${temp_file}" 2>/dev/null; then
                     mv "${temp_file}" "${junit_file}"
-                    echo "Cleaned: ${filename}"
-                    rm "${junit_file}.backup"
+                    echo "✓ Cleaned: ${filename}"
+                    rm "${junit_file}.backup"  # Remove backup on success
                 else
-                    echo "Failed to clean: ${filename} (restored from backup)"
-                    mv "${junit_file}.backup" "${junit_file}"
+                    echo "✗ Failed to clean: ${filename} (restored from backup)"
+                    mv "${junit_file}.backup" "${junit_file}"  # Restore from backup
                     cleanup_success=false
                 fi
             fi
@@ -1205,11 +1212,10 @@ run_gingko_tests() {
     echo "Results are available in: ${test_results_dir}"
     if [[ "${cleanup_success}" == "true" ]]; then
         echo "Unit XML files have been cleaned ('Monitor cluster while tests execute' test case removed)"
+        record_junit "${vmname}" "clean_junit_xml_files" "OK"
     else
         echo "Some XML files could not be cleaned (originals preserved)"
-    fi
-    if [[ -f "${test_results_dir}/test-output.log" ]]; then
-        echo "Test output log: ${test_results_dir}/test-output.log"
+        record_junit "${vmname}" "clean_junit_xml_files" "FAILED"
     fi
 
     # Record the junit result of the ginkgo tests
@@ -1217,6 +1223,7 @@ run_gingko_tests() {
         record_junit "${vmname}" "run_gingko_tests" "OK"
     else
         record_junit "${vmname}" "run_gingko_tests" "FAILED"
+        exit 1
     fi
 }
 

From 0e978dbd7ad6260941b81bcb8d577b5afce9fcd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Gull=C3=B3n?= <agullon@redhat.com>
Date: Tue, 30 Sep 2025 08:04:25 +0000
Subject: [PATCH 13/16] use 'does_commit_exist()' instead of
 'does_image_exist()' in rpm-ostree

---
 test/scenarios/releases/el96-lrel@backups.sh                | 6 +++---
 test/scenarios/releases/el96-lrel@dual-stack.sh             | 6 +++---
 test/scenarios/releases/el96-lrel@ginkgo-tests.sh           | 6 +++---
 test/scenarios/releases/el96-lrel@ipv6.sh                   | 6 +++---
 test/scenarios/releases/el96-lrel@low-latency.sh            | 6 +++---
 test/scenarios/releases/el96-lrel@multi-nic.sh              | 6 +++---
 test/scenarios/releases/el96-lrel@optional.sh               | 6 +++---
 test/scenarios/releases/el96-lrel@osconfig.sh               | 6 +++---
 test/scenarios/releases/el96-lrel@router.sh                 | 6 +++---
 test/scenarios/releases/el96-lrel@standard1.sh              | 6 +++---
 test/scenarios/releases/el96-lrel@standard2.sh              | 6 +++---
 test/scenarios/releases/el96-lrel@storage.sh                | 6 +++---
 test/scenarios/releases/el96-yminus1@el96-lrel@standard1.sh | 6 +++---
 test/scenarios/releases/el96-yminus1@el96-lrel@standard2.sh | 6 +++---
 test/scenarios/releases/el96-yminus2@el96-lrel@standard1.sh | 6 +++---
 test/scenarios/releases/el96-yminus2@el96-lrel@standard2.sh | 6 +++---
 16 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/test/scenarios/releases/el96-lrel@backups.sh b/test/scenarios/releases/el96-lrel@backups.sh
index 5677c34c1e..469a8ecab2 100644
--- a/test/scenarios/releases/el96-lrel@backups.sh
+++ b/test/scenarios/releases/el96-lrel@backups.sh
@@ -5,7 +5,7 @@
 start_image="rhel-9.6-microshift-brew-optionals-4.${MINOR_VERSION}-${LATEST_RELEASE_TYPE}"
 
 scenario_create_vms() {
-    if ! does_image_exist "${start_image}"; then
+    if ! does_commit_exist "${start_image}"; then
         echo "Image '${start_image}' not found - skipping test"
         return 0
     fi
@@ -15,7 +15,7 @@ scenario_create_vms() {
 }
 
 scenario_remove_vms() {
-    if ! does_image_exist "${start_image}"; then
+    if ! does_commit_exist "${start_image}"; then
         echo "Image '${start_image}' not found - skipping test"
         return 0
     fi
@@ -24,7 +24,7 @@ scenario_remove_vms() {
 }
 
 scenario_run_tests() {
-    if ! does_image_exist "${start_image}"; then
+    if ! does_commit_exist "${start_image}"; then
         echo "Image '${start_image}' not found - skipping test"
         return 0
     fi
diff --git a/test/scenarios/releases/el96-lrel@dual-stack.sh b/test/scenarios/releases/el96-lrel@dual-stack.sh
index 8dfe957a75..d211869c03 100644
--- a/test/scenarios/releases/el96-lrel@dual-stack.sh
+++ b/test/scenarios/releases/el96-lrel@dual-stack.sh
@@ -5,7 +5,7 @@
 start_image="rhel-9.6-microshift-brew-optionals-4.${MINOR_VERSION}-${LATEST_RELEASE_TYPE}"
 
 scenario_create_vms() {
-    if ! does_image_exist "${start_image}"; then
+    if ! does_commit_exist "${start_image}"; then
         echo "Image '${start_image}' not found - skipping test"
         return 0
     fi
@@ -15,7 +15,7 @@ scenario_create_vms() {
 }
 
 scenario_remove_vms() {
-    if ! does_image_exist "${start_image}"; then
+    if ! does_commit_exist "${start_image}"; then
         echo "Image '${start_image}' not found - skipping test"
         return 0
     fi
@@ -24,7 +24,7 @@ scenario_remove_vms() {
 }
 
 scenario_run_tests() {
-    if ! does_image_exist "${start_image}"; then
+    if ! does_commit_exist "${start_image}"; then
         echo "Image '${start_image}' not found - skipping test"
         return 0
     fi
diff --git a/test/scenarios/releases/el96-lrel@ginkgo-tests.sh b/test/scenarios/releases/el96-lrel@ginkgo-tests.sh
index 593874e838..cb81117ea0 100644
--- a/test/scenarios/releases/el96-lrel@ginkgo-tests.sh
+++ b/test/scenarios/releases/el96-lrel@ginkgo-tests.sh
@@ -5,7 +5,7 @@
 start_image="rhel-9.6-microshift-brew-optionals-4.${MINOR_VERSION}-${LATEST_RELEASE_TYPE}"
 
 scenario_create_vms() {
-    if ! does_image_exist "${start_image}"; then
+    if ! does_commit_exist "${start_image}"; then
         echo "Image '${start_image}' not found - skipping test"
         return 0
     fi
@@ -15,7 +15,7 @@ scenario_create_vms() {
 }
 
 scenario_remove_vms() {
-    if ! does_image_exist "${start_image}"; then
+    if ! does_commit_exist "${start_image}"; then
         echo "Image '${start_image}' not found - skipping test"
         return 0
     fi
@@ -24,7 +24,7 @@ scenario_remove_vms() {
 }
 
 scenario_run_tests() {
-    if ! does_image_exist "${start_image}"; then
+    if ! does_commit_exist "${start_image}"; then
         echo "Image '${start_image}' not found - skipping test"
         return 0
     fi
diff --git a/test/scenarios/releases/el96-lrel@ipv6.sh b/test/scenarios/releases/el96-lrel@ipv6.sh
index 158c7ad1ab..ba2a5abdac 100644
--- a/test/scenarios/releases/el96-lrel@ipv6.sh
+++ b/test/scenarios/releases/el96-lrel@ipv6.sh
@@ -14,7 +14,7 @@ start_image="rhel-9.6-microshift-brew-optionals-4.${MINOR_VERSION}-${LATEST_RELE
 
 scenario_create_vms() {
     # Enable IPv6 single stack in kickstart
-    if ! does_image_exist "${start_image}"; then
+    if ! does_commit_exist "${start_image}"; then
         echo "Image '${start_image}' not found - skipping test"
         return 0
     fi
@@ -24,7 +24,7 @@ scenario_create_vms() {
 }
 
 scenario_remove_vms() {
-    if ! does_image_exist "${start_image}"; then
+    if ! does_commit_exist "${start_image}"; then
         echo "Image '${start_image}' not found - skipping test"
         return 0
     fi
@@ -33,7 +33,7 @@ scenario_remove_vms() {
 }
 
 scenario_run_tests() {
-    if ! does_image_exist "${start_image}"; then
+    if ! does_commit_exist "${start_image}"; then
         echo "Image '${start_image}' not found - skipping test"
         return 0
     fi
diff --git a/test/scenarios/releases/el96-lrel@low-latency.sh b/test/scenarios/releases/el96-lrel@low-latency.sh
index 27c5fd0a19..e44c2319cc 100644
--- a/test/scenarios/releases/el96-lrel@low-latency.sh
+++ b/test/scenarios/releases/el96-lrel@low-latency.sh
@@ -8,7 +8,7 @@ export TEST_RANDOMIZATION=none
 start_image="rhel-9.6-microshift-brew-tuned-4.${MINOR_VERSION}-${LATEST_RELEASE_TYPE}"
 
 scenario_create_vms() {
-    if ! does_image_exist "${start_image}"; then
+    if ! does_commit_exist "${start_image}"; then
         echo "Image '${start_image}' not found - skipping test"
         return 0
     fi
@@ -18,7 +18,7 @@ scenario_create_vms() {
 }
 
 scenario_remove_vms() {
-    if ! does_image_exist "${start_image}"; then
+    if ! does_commit_exist "${start_image}"; then
         echo "Image '${start_image}' not found - skipping test"
         return 0
     fi
@@ -27,7 +27,7 @@ scenario_remove_vms() {
 }
 
 scenario_run_tests() {
-    if ! does_image_exist "${start_image}"; then
+    if ! does_commit_exist "${start_image}"; then
         echo "Image '${start_image}' not found - skipping test"
         return 0
     fi
diff --git a/test/scenarios/releases/el96-lrel@multi-nic.sh b/test/scenarios/releases/el96-lrel@multi-nic.sh
index b10682cc85..eab6f04326 100644
--- a/test/scenarios/releases/el96-lrel@multi-nic.sh
+++ b/test/scenarios/releases/el96-lrel@multi-nic.sh
@@ -5,7 +5,7 @@
 start_image="rhel-9.6-microshift-brew-optionals-4.${MINOR_VERSION}-${LATEST_RELEASE_TYPE}"
 
 scenario_create_vms() {
-    if ! does_image_exist "${start_image}"; then
+    if ! does_commit_exist "${start_image}"; then
         echo "Image '${start_image}' not found - skipping test"
         return 0
     fi
@@ -16,7 +16,7 @@ scenario_create_vms() {
 }
 
 scenario_remove_vms() {
-    if ! does_image_exist "${start_image}"; then
+    if ! does_commit_exist "${start_image}"; then
         echo "Image '${start_image}' not found - skipping test"
         return 0
     fi
@@ -25,7 +25,7 @@ scenario_remove_vms() {
 }
 
 scenario_run_tests() {
-    if ! does_image_exist "${start_image}"; then
+    if ! does_commit_exist "${start_image}"; then
         echo "Image '${start_image}' not found - skipping test"
         return 0
     fi
diff --git a/test/scenarios/releases/el96-lrel@optional.sh b/test/scenarios/releases/el96-lrel@optional.sh
index 953c60e299..8445f674b3 100644
--- a/test/scenarios/releases/el96-lrel@optional.sh
+++ b/test/scenarios/releases/el96-lrel@optional.sh
@@ -10,7 +10,7 @@ WEB_SERVER_URL="http://${VM_BRIDGE_IP}:${WEB_SERVER_PORT}"
 start_image="rhel-9.6-microshift-brew-optionals-4.${MINOR_VERSION}-${LATEST_RELEASE_TYPE}"
 
 scenario_create_vms() {
-    if ! does_image_exist "${start_image}"; then
+    if ! does_commit_exist "${start_image}"; then
         echo "Image '${start_image}' not found - skipping test"
         return 0
     fi
@@ -21,7 +21,7 @@ scenario_create_vms() {
 }
 
 scenario_remove_vms() {
-    if ! does_image_exist "${start_image}"; then
+    if ! does_commit_exist "${start_image}"; then
         echo "Image '${start_image}' not found - skipping test"
         return 0
     fi
@@ -30,7 +30,7 @@ scenario_remove_vms() {
 }
 
 scenario_run_tests() {
-    if ! does_image_exist "${start_image}"; then
+    if ! does_commit_exist "${start_image}"; then
         echo "Image '${start_image}' not found - skipping test"
         return 0
     fi
diff --git a/test/scenarios/releases/el96-lrel@osconfig.sh b/test/scenarios/releases/el96-lrel@osconfig.sh
index 156dc6757b..0bffbac7a5 100644
--- a/test/scenarios/releases/el96-lrel@osconfig.sh
+++ b/test/scenarios/releases/el96-lrel@osconfig.sh
@@ -5,7 +5,7 @@
 start_image="rhel-9.6-microshift-brew-optionals-4.${MINOR_VERSION}-${LATEST_RELEASE_TYPE}"
 
 scenario_create_vms() {
-    if ! does_image_exist "${start_image}"; then
+    if ! does_commit_exist "${start_image}"; then
         echo "Image '${start_image}' not found - skipping test"
         return 0
     fi
@@ -15,7 +15,7 @@ scenario_create_vms() {
 }
 
 scenario_remove_vms() {
-    if ! does_image_exist "${start_image}"; then
+    if ! does_commit_exist "${start_image}"; then
         echo "Image '${start_image}' not found - skipping test"
         return 0
     fi
@@ -24,7 +24,7 @@ scenario_remove_vms() {
 }
 
 scenario_run_tests() {
-    if ! does_image_exist "${start_image}"; then
+    if ! does_commit_exist "${start_image}"; then
         echo "Image '${start_image}' not found - skipping test"
         return 0
     fi
diff --git a/test/scenarios/releases/el96-lrel@router.sh b/test/scenarios/releases/el96-lrel@router.sh
index 5df1d90db2..6e6b8e11e8 100644
--- a/test/scenarios/releases/el96-lrel@router.sh
+++ b/test/scenarios/releases/el96-lrel@router.sh
@@ -7,7 +7,7 @@ export TEST_EXCLUDES="ushift-6085"
 start_image="rhel-9.6-microshift-brew-optionals-4.${MINOR_VERSION}-${LATEST_RELEASE_TYPE}"
 
 scenario_create_vms() {
-    if ! does_image_exist "${start_image}"; then
+    if ! does_commit_exist "${start_image}"; then
         echo "Image '${start_image}' not found - skipping test"
         return 0
     fi
@@ -17,7 +17,7 @@ scenario_create_vms() {
 }
 
 scenario_remove_vms() {
-    if ! does_image_exist "${start_image}"; then
+    if ! does_commit_exist "${start_image}"; then
         echo "Image '${start_image}' not found - skipping test"
         return 0
     fi
@@ -26,7 +26,7 @@ scenario_remove_vms() {
 }
 
 scenario_run_tests() {
-    if ! does_image_exist "${start_image}"; then
+    if ! does_commit_exist "${start_image}"; then
         echo "Image '${start_image}' not found - skipping test"
         return 0
     fi
diff --git a/test/scenarios/releases/el96-lrel@standard1.sh b/test/scenarios/releases/el96-lrel@standard1.sh
index e349e7f202..03ddb91ce7 100644
--- a/test/scenarios/releases/el96-lrel@standard1.sh
+++ b/test/scenarios/releases/el96-lrel@standard1.sh
@@ -5,7 +5,7 @@
 start_image="rhel-9.6-microshift-brew-optionals-4.${MINOR_VERSION}-${LATEST_RELEASE_TYPE}"
 
 scenario_create_vms() {
-    if ! does_image_exist "${start_image}"; then
+    if ! does_commit_exist "${start_image}"; then
         echo "Image '${start_image}' not found - skipping test"
         return 0
     fi
@@ -15,7 +15,7 @@ scenario_create_vms() {
 }
 
 scenario_remove_vms() {
-    if ! does_image_exist "${start_image}"; then
+    if ! does_commit_exist "${start_image}"; then
         echo "Image '${start_image}' not found - skipping test"
         return 0
     fi
@@ -24,7 +24,7 @@ scenario_remove_vms() {
 }
 
 scenario_run_tests() {
-    if ! does_image_exist "${start_image}"; then
+    if ! does_commit_exist "${start_image}"; then
         echo "Image '${start_image}' not found - skipping test"
         return 0
     fi
diff --git a/test/scenarios/releases/el96-lrel@standard2.sh b/test/scenarios/releases/el96-lrel@standard2.sh
index 196f95c82d..154cdffe5c 100644
--- a/test/scenarios/releases/el96-lrel@standard2.sh
+++ b/test/scenarios/releases/el96-lrel@standard2.sh
@@ -5,7 +5,7 @@
 start_image="rhel-9.6-microshift-brew-optionals-4.${MINOR_VERSION}-${LATEST_RELEASE_TYPE}"
 
 scenario_create_vms() {
-    if ! does_image_exist "${start_image}"; then
+    if ! does_commit_exist "${start_image}"; then
         echo "Image '${start_image}' not found - skipping test"
         return 0
     fi
@@ -15,7 +15,7 @@ scenario_create_vms() {
 }
 
 scenario_remove_vms() {
-    if ! does_image_exist "${start_image}"; then
+    if ! does_commit_exist "${start_image}"; then
         echo "Image '${start_image}' not found - skipping test"
         return 0
     fi
@@ -24,7 +24,7 @@ scenario_remove_vms() {
 }
 
 scenario_run_tests() {
-    if ! does_image_exist "${start_image}"; then
+    if ! does_commit_exist "${start_image}"; then
         echo "Image '${start_image}' not found - skipping test"
         return 0
     fi
diff --git a/test/scenarios/releases/el96-lrel@storage.sh b/test/scenarios/releases/el96-lrel@storage.sh
index 251418fcc1..4ec333499d 100644
--- a/test/scenarios/releases/el96-lrel@storage.sh
+++ b/test/scenarios/releases/el96-lrel@storage.sh
@@ -5,7 +5,7 @@
 start_image="rhel-9.6-microshift-brew-optionals-4.${MINOR_VERSION}-${LATEST_RELEASE_TYPE}"
 
 scenario_create_vms() {
-    if ! does_image_exist "${start_image}"; then
+    if ! does_commit_exist "${start_image}"; then
         echo "Image '${start_image}' not found - skipping test"
         return 0
     fi
@@ -15,7 +15,7 @@ scenario_create_vms() {
 }
 
 scenario_remove_vms() {
-    if ! does_image_exist "${start_image}"; then
+    if ! does_commit_exist "${start_image}"; then
         echo "Image '${start_image}' not found - skipping test"
         return 0
     fi
@@ -24,7 +24,7 @@ scenario_remove_vms() {
 }
 
 scenario_run_tests() {
-    if ! does_image_exist "${start_image}"; then
+    if ! does_commit_exist "${start_image}"; then
         echo "Image '${start_image}' not found - skipping test"
         return 0
     fi
diff --git a/test/scenarios/releases/el96-yminus1@el96-lrel@standard1.sh b/test/scenarios/releases/el96-yminus1@el96-lrel@standard1.sh
index a099473433..6228054991 100644
--- a/test/scenarios/releases/el96-yminus1@el96-lrel@standard1.sh
+++ b/test/scenarios/releases/el96-yminus1@el96-lrel@standard1.sh
@@ -9,7 +9,7 @@ export TEST_RANDOMIZATION=none
 start_image="rhel-9.6-microshift-brew-optionals-4.${PREVIOUS_MINOR_VERSION}-zstream"
 
 scenario_create_vms() {
-    if ! does_image_exist "${start_image}"; then
+    if ! does_commit_exist "${start_image}"; then
         echo "Image '${start_image}' not found - skipping test"
         return 0
     fi
@@ -19,7 +19,7 @@ scenario_create_vms() {
 }
 
 scenario_remove_vms() {
-    if ! does_image_exist "${start_image}"; then
+    if ! does_commit_exist "${start_image}"; then
         echo "Image '${start_image}' not found - skipping test"
         return 0
     fi
@@ -28,7 +28,7 @@ scenario_remove_vms() {
 }
 
 scenario_run_tests() {
-    if ! does_image_exist "${start_image}"; then
+    if ! does_commit_exist "${start_image}"; then
         echo "Image '${start_image}' not found - skipping test"
         return 0
     fi
diff --git a/test/scenarios/releases/el96-yminus1@el96-lrel@standard2.sh b/test/scenarios/releases/el96-yminus1@el96-lrel@standard2.sh
index 7727e9bb9b..d259cd43fc 100644
--- a/test/scenarios/releases/el96-yminus1@el96-lrel@standard2.sh
+++ b/test/scenarios/releases/el96-yminus1@el96-lrel@standard2.sh
@@ -9,7 +9,7 @@ export TEST_RANDOMIZATION=none
 start_image="rhel-9.6-microshift-brew-optionals-4.${PREVIOUS_MINOR_VERSION}-zstream"
 
 scenario_create_vms() {
-    if ! does_image_exist "${start_image}"; then
+    if ! does_commit_exist "${start_image}"; then
         echo "Image '${start_image}' not found - skipping test"
         return 0
     fi
@@ -19,7 +19,7 @@ scenario_create_vms() {
 }
 
 scenario_remove_vms() {
-    if ! does_image_exist "${start_image}"; then
+    if ! does_commit_exist "${start_image}"; then
         echo "Image '${start_image}' not found - skipping test"
         return 0
     fi
@@ -28,7 +28,7 @@ scenario_remove_vms() {
 }
 
 scenario_run_tests() {
-    if ! does_image_exist "${start_image}"; then
+    if ! does_commit_exist "${start_image}"; then
         echo "Image '${start_image}' not found - skipping test"
         return 0
     fi
diff --git a/test/scenarios/releases/el96-yminus2@el96-lrel@standard1.sh b/test/scenarios/releases/el96-yminus2@el96-lrel@standard1.sh
index eb62ce03e8..8984fde273 100644
--- a/test/scenarios/releases/el96-yminus2@el96-lrel@standard1.sh
+++ b/test/scenarios/releases/el96-yminus2@el96-lrel@standard1.sh
@@ -9,7 +9,7 @@ export TEST_RANDOMIZATION=none
 dest_image="rhel-9.6-microshift-brew-optionals-4.${MINOR_VERSION}-${LATEST_RELEASE_TYPE}"
 
 scenario_create_vms() {
-    if ! does_image_exist "${dest_image}"; then
+    if ! does_commit_exist "${dest_image}"; then
         echo "Image '${dest_image}' not found - skipping test"
         return 0
     fi
@@ -19,7 +19,7 @@ scenario_create_vms() {
 }
 
 scenario_remove_vms() {
-    if ! does_image_exist "${dest_image}"; then
+    if ! does_commit_exist "${dest_image}"; then
         echo "Image '${dest_image}' not found - skipping test"
         return 0
     fi
@@ -28,7 +28,7 @@ scenario_remove_vms() {
 }
 
 scenario_run_tests() {
-    if ! does_image_exist "${dest_image}"; then
+    if ! does_commit_exist "${dest_image}"; then
         echo "Image '${dest_image}' not found - skipping test"
         return 0
     fi
diff --git a/test/scenarios/releases/el96-yminus2@el96-lrel@standard2.sh b/test/scenarios/releases/el96-yminus2@el96-lrel@standard2.sh
index 0c5a7bccd1..e6ae2f03e7 100644
--- a/test/scenarios/releases/el96-yminus2@el96-lrel@standard2.sh
+++ b/test/scenarios/releases/el96-yminus2@el96-lrel@standard2.sh
@@ -9,7 +9,7 @@ export TEST_RANDOMIZATION=none
 dest_image="rhel-9.6-microshift-brew-optionals-4.${MINOR_VERSION}-${LATEST_RELEASE_TYPE}"
 
 scenario_create_vms() {
-    if ! does_image_exist "${dest_image}"; then
+    if ! does_commit_exist "${dest_image}"; then
         echo "Image '${dest_image}' not found - skipping test"
         return 0
     fi
@@ -19,7 +19,7 @@ scenario_create_vms() {
 }
 
 scenario_remove_vms() {
-    if ! does_image_exist "${dest_image}"; then
+    if ! does_commit_exist "${dest_image}"; then
         echo "Image '${dest_image}' not found - skipping test"
         return 0
     fi
@@ -28,7 +28,7 @@ scenario_remove_vms() {
 }
 
 scenario_run_tests() {
-    if ! does_image_exist "${dest_image}"; then
+    if ! does_commit_exist "${dest_image}"; then
         echo "Image '${dest_image}' not found - skipping test"
         return 0
     fi

From 1793cf87c8961ed928b63a248e4f145954e933cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Gull=C3=B3n?= <agullon@redhat.com>
Date: Tue, 30 Sep 2025 12:21:15 +0000
Subject: [PATCH 14/16] small fixes to gettool_ginkgo()

---
 scripts/fetch_tools.sh | 34 +++++++++++++---------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/scripts/fetch_tools.sh b/scripts/fetch_tools.sh
index 2b7e3119ce..23ebdcd1ab 100755
--- a/scripts/fetch_tools.sh
+++ b/scripts/fetch_tools.sh
@@ -261,10 +261,12 @@ gettool_ginkgo() {
 
     local -r repo_url="https://${GITHUB_TOKEN}@github.com/openshift/openshift-tests-private.git"
     local -r binary_path="${GINKGO_TEST_BINARY}"
-    local -r release_branch="release-4.${MINOR_VERSION}"
+    local -r release_branch="${SCENARIO_BUILD_BRANCH}"
+    
+    local -r handleresult_script="${HANDLERESULT_SCRIPT}"
 
     # Skip if binary already exists
-    [[ -f "${binary_path}" ]] && return 0
+    [[ -f "${binary_path}" ]] && [[ -f "${handleresult_script}" ]] && return 0
 
     # Check if Go is available
     if ! command -v go &> /dev/null; then
@@ -289,40 +291,30 @@ gettool_ginkgo() {
 
     # Build the binary
     pushd "${clone_dir}" &>/dev/null
-
-    local test_binary="./bin/extended-platform-tests"
     make build
 
     # Copy binary to centralized location
+    local test_binary="./bin/extended-platform-tests"
     if [[ -f "${test_binary}" ]]; then
         cp "${test_binary}" "${binary_path}"
         chmod +x "${binary_path}"
         echo "Binary installed to ${binary_path}"
-
-	    # Copy handleresult.py to the tools directory
-        if [[ -f "${clone_dir}/pipeline/handleresult.py" ]] && [[ -f "${HANDLERESULT_SCRIPT}" ]]; then
-            cp "${clone_dir}/pipeline/handleresult.py" "${HANDLERESULT_SCRIPT}"
-            chmod +x "${HANDLERESULT_SCRIPT}"
-            echo "handleresult.py installed to ${HANDLERESULT_SCRIPT}"
-        else
-            echo "Warning: pipeline/handleresult.py not found in repository"
-        fi
-
-        popd &>/dev/null
     else
         echo "Error: Test binary not found after build"
-        popd &>/dev/null
         return 1
     fi
 
     # Copy handleresult.py to the tools directory
-    if [[ -f "${clone_dir}/pipeline/handleresult.py" ]] && [[ -f "${HANDLERESULT_SCRIPT}" ]]; then
-        cp "${clone_dir}/pipeline/handleresult.py" "${HANDLERESULT_SCRIPT}"
-        chmod +x "${HANDLERESULT_SCRIPT}"
-        echo "handleresult.py installed to ${HANDLERESULT_SCRIPT}"
+    local handleresult_script_local="./pipeline/handleresult.py"
+    if [[ -f "${handleresult_script_local}" ]] && [[ ! -f "${handleresult_script}" ]]; then
+        cp "${handleresult_script_local}" "${handleresult_script}"
+        chmod +x "${handleresult_script}"
+        echo "handleresult.py installed to ${handleresult_script}"
     else
-        echo "Warning: pipeline/handleresult.py not found in repository"
+        echo "Error: pipeline/handleresult.py not found in repository"
+        return 1
     fi
+    popd &>/dev/null
 }
 
 tool_getters=$(declare -F | awk '$3 ~ /^gettool_/ {print $3}' | sed 's/^gettool_//g')

From dfb32f6d1bb91ede2ed8cdce54c146d449c6e863 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Gull=C3=B3n?= <agullon@redhat.com>
Date: Tue, 30 Sep 2025 13:13:24 +0000
Subject: [PATCH 15/16] use make all instead of make build to update before
 building

---
 scripts/fetch_tools.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/fetch_tools.sh b/scripts/fetch_tools.sh
index 23ebdcd1ab..b8c00ddaee 100755
--- a/scripts/fetch_tools.sh
+++ b/scripts/fetch_tools.sh
@@ -261,7 +261,7 @@ gettool_ginkgo() {
 
     local -r repo_url="https://${GITHUB_TOKEN}@github.com/openshift/openshift-tests-private.git"
     local -r binary_path="${GINKGO_TEST_BINARY}"
-    local -r release_branch="${SCENARIO_BUILD_BRANCH}"
+    local -r release_branch="release-4.${MINOR_VERSION}"
     
     local -r handleresult_script="${HANDLERESULT_SCRIPT}"
 
@@ -291,7 +291,7 @@ gettool_ginkgo() {
 
     # Build the binary
     pushd "${clone_dir}" &>/dev/null
-    make build
+    make all
 
     # Copy binary to centralized location
     local test_binary="./bin/extended-platform-tests"

From 2aab4c954c5cf0c677b23d221d9f1ffadc13a464 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Gull=C3=B3n?= <agullon@redhat.com>
Date: Wed, 1 Oct 2025 10:52:47 +0000
Subject: [PATCH 16/16] set specific commit to avoid errors because microshift
 and openshift-test-private repos are not in sync

---
 scripts/fetch_tools.sh      | 33 +++++++++++++++++----------------
 test/bin/common_versions.sh |  6 ++++++
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/scripts/fetch_tools.sh b/scripts/fetch_tools.sh
index b8c00ddaee..f451762fb3 100755
--- a/scripts/fetch_tools.sh
+++ b/scripts/fetch_tools.sh
@@ -260,37 +260,38 @@ gettool_ginkgo() {
     source "${SCRIPT_DIR}/../test/bin/common_versions.sh"
 
     local -r repo_url="https://${GITHUB_TOKEN}@github.com/openshift/openshift-tests-private.git"
-    local -r binary_path="${GINKGO_TEST_BINARY}"
-    local -r release_branch="release-4.${MINOR_VERSION}"
+    local -r repo_branch="${OPENSHIFT_TESTS_PRIVATE_REPO_BRANCH}"
+    local -r repo_commit="${OPENSHIFT_TESTS_PRIVATE_REPO_COMMIT}"
+    local clone_dir="${WORK_DIR}/openshift-tests-private"
     
+    local -r binary_path="${GINKGO_TEST_BINARY}"
     local -r handleresult_script="${HANDLERESULT_SCRIPT}"
 
-    # Skip if binary already exists
-    [[ -f "${binary_path}" ]] && [[ -f "${handleresult_script}" ]] && return 0
-
     # Check if Go is available
     if ! command -v go &> /dev/null; then
         echo "Error: Go is required to build openshift-tests-private binary"
         return 1
     fi
 
-    # Ensure binary directory exists
+    # Check if binary and handleresult.py already exist
+    [[ -f "${binary_path}" ]] && [[ -f "${handleresult_script}" ]] && return 0
     mkdir -p "$(dirname "${binary_path}")"
 
-    # Use global WORK_DIR for cloning
-    local clone_dir="${WORK_DIR}/openshift-tests-private"
-
     # Clone repository with release branch preference
-    if ! git clone --depth 1 --branch "${release_branch}" "${repo_url}" "${clone_dir}" 2>/dev/null; then
-        echo "Branch ${release_branch} not found, cloning default branch..."
-        if ! git clone --depth 1 "${repo_url}" "${clone_dir}"; then
-            echo "Error: Failed to clone repository"
-            return 1
-        fi
+    if ! git clone --depth 1000 --branch "${repo_branch}" "${repo_url}" "${clone_dir}" 2>/dev/null; then
+        echo "Error: Failed to clone repository"
+        return 1
     fi
 
-    # Build the binary
     pushd "${clone_dir}" &>/dev/null
+
+    # Checkout a valid commit to be sure ginkgo tests are working
+    if ! (git checkout --quiet "${repo_commit}"); then
+        echo "Error: Failed to checkout specific commit"
+        return 1
+    fi
+
+    # Build the binary
     make all
 
     # Copy binary to centralized location
diff --git a/test/bin/common_versions.sh b/test/bin/common_versions.sh
index b2b9d34dbc..54405edee8 100644
--- a/test/bin/common_versions.sh
+++ b/test/bin/common_versions.sh
@@ -144,3 +144,9 @@ export LATEST_RELEASE_TYPE
 
 BREW_LREL_RELEASE_VERSION="${BREW_EC_RELEASE_VERSION}"
 export BREW_LREL_RELEASE_VERSION
+
+# Branch and commit for the openshift-tests-private repository
+OPENSHIFT_TESTS_PRIVATE_REPO_BRANCH="release-4.${MINOR_VERSION}"
+OPENSHIFT_TESTS_PRIVATE_REPO_COMMIT="61613d96c91db7b2907c24dd257075d3f2201991"
+export OPENSHIFT_TESTS_PRIVATE_REPO_BRANCH
+export OPENSHIFT_TESTS_PRIVATE_REPO_COMMIT
\ No newline at end of file