INTEROP-9402: Add MAP_TESTS support to Quay and ACM step refs

ci-operator/step-registry/acm/tests/alc/acm-tests-alc-commands.sh

@@ -3,6 +3,23 @@ set -o nounset
 # set -o errexit
 set -o pipefail
 
+if [ "${MAP_TESTS}" = "true" ]; then
+    eval "$(
+        typeset -a _fURL=()
+        type -t wget 1>/dev/null && _fURL=(wget --timeout=30 -qO-) || _fURL=(curl --connect-timeout 10 --max-time 30 -fsSL)
+        "${_fURL[@]}" \
+            https://raw.githubusercontent.com/RedHatQE/OpenShift-LP-QE--Tools/refs/heads/main/libs/bash/ci-operator/interop/common/ExitTrap--PostProcessPrep.sh
+    )"
+    if type -t ExitTrap--PostProcessPrep 1>/dev/null; then
+        trap '
+            LP_IO__ET_PPP__NEW_TS_NAME="${DR__RP__CR_COMP_NAME}--%s" \
+                ExitTrap--PostProcessPrep
+        ' EXIT
+    else
+        echo "WARNING: ExitTrap--PostProcessPrep not available, skipping junit remapping" >&2
+    fi
+fi
+
 # The variables defined in this step come from files in the `SHARED_DIR` and credentials from Vault.
 SECRETS_DIR="/tmp/secrets"
 

ci-operator/step-registry/acm/tests/alc/acm-tests-alc-ref.yaml

@@ -3,6 +3,7 @@ ref:
   from: console-e2e
   commands: acm-tests-alc-commands.sh
   timeout: 28800s
+  grace_period: 15m0s
   resources:
     requests:
       cpu: '2'
@@ -15,6 +16,12 @@ ref:
       name: acm-ci-credentials
       mount_path: /tmp/secrets/ci 
   env:
+  - name: DR__RP__CR_COMP_NAME
+    default: "lp-interop--ACM"
+    documentation: Component Readiness component name for junit remapping
+  - name: MAP_TESTS
+    default: "false"
+    documentation: When true, remap junit test suite names for Component Readiness routing
   - name: CYPRESS_OC_CLUSTER_USER
     default: "kubeadmin"
     documentation: |-

ci-operator/step-registry/acm/tests/grc/acm-tests-grc-commands.sh

@@ -3,6 +3,23 @@ set -o nounset
 # set -o errexit
 set -o pipefail
 
+if [ "${MAP_TESTS}" = "true" ]; then
+    eval "$(
+        typeset -a _fURL=()
+        type -t wget 1>/dev/null && _fURL=(wget --timeout=30 -qO-) || _fURL=(curl --connect-timeout 10 --max-time 30 -fsSL)
+        "${_fURL[@]}" \
+            https://raw.githubusercontent.com/RedHatQE/OpenShift-LP-QE--Tools/refs/heads/main/libs/bash/ci-operator/interop/common/ExitTrap--PostProcessPrep.sh
+    )"
+    if type -t ExitTrap--PostProcessPrep 1>/dev/null; then
+        trap '
+            LP_IO__ET_PPP__NEW_TS_NAME="${DR__RP__CR_COMP_NAME}--%s" \
+                ExitTrap--PostProcessPrep
+        ' EXIT
+    else
+        echo "WARNING: ExitTrap--PostProcessPrep not available, skipping junit remapping" >&2
+    fi
+fi
+
 # The variables defined in this step come from files in the `SHARED_DIR` and credentials from Vault.
 SECRETS_DIR="/tmp/secrets"
 

ci-operator/step-registry/acm/tests/grc/acm-tests-grc-ref.yaml

@@ -3,6 +3,7 @@ ref:
   from: acmqe-grc-test
   commands: acm-tests-grc-commands.sh
   timeout: 28800s
+  grace_period: 15m0s
   resources:
     requests:
       cpu: '2'
@@ -15,6 +16,12 @@ ref:
       name: acm-ci-credentials
       mount_path: /tmp/secrets/ci 
   env:
+  - name: DR__RP__CR_COMP_NAME
+    default: "lp-interop--ACM"
+    documentation: Component Readiness component name for junit remapping
+  - name: MAP_TESTS
+    default: "false"
+    documentation: When true, remap junit test suite names for Component Readiness routing
   - name: CYPRESS_OC_IDP
     default: "kube:admin"
     documentation: |-

ci-operator/step-registry/acm/tests/observability/acm-tests-observability-commands.sh

@@ -1,6 +1,23 @@
 #!/bin/bash
 set -euxo pipefail; shopt -s inherit_errexit
 
+if [ "${MAP_TESTS}" = "true" ]; then
+    eval "$(
+        typeset -a _fURL=()
+        type -t wget 1>/dev/null && _fURL=(wget --timeout=30 -qO-) || _fURL=(curl --connect-timeout 10 --max-time 30 -fsSL)
+        "${_fURL[@]}" \
+            https://raw.githubusercontent.com/RedHatQE/OpenShift-LP-QE--Tools/refs/heads/main/libs/bash/ci-operator/interop/common/ExitTrap--PostProcessPrep.sh
+    )"
+    if type -t ExitTrap--PostProcessPrep 1>/dev/null; then
+        trap '
+            LP_IO__ET_PPP__NEW_TS_NAME="${DR__RP__CR_COMP_NAME}--%s" \
+                ExitTrap--PostProcessPrep
+        ' EXIT
+    else
+        echo "WARNING: ExitTrap--PostProcessPrep not available, skipping junit remapping" >&2
+    fi
+fi
+
 # The variables defined in this step come from files in the `SHARED_DIR` and credentials from Vault.
 typeset secretsDir="/tmp/secrets"
 

ci-operator/step-registry/acm/tests/observability/acm-tests-observability-ref.yaml

@@ -3,6 +3,7 @@ ref:
   from: multicluster-observability-operator-opp
   commands: acm-tests-observability-commands.sh
   timeout: 28800s
+  grace_period: 15m0s
   resources:
     requests:
       cpu: '2'
@@ -15,6 +16,12 @@ ref:
       name: acm-ci-credentials
       mount_path: /tmp/secrets/ci 
   env:
+  - name: DR__RP__CR_COMP_NAME
+    default: "lp-interop--ACM"
+    documentation: Component Readiness component name for junit remapping
+  - name: MAP_TESTS
+    default: "false"
+    documentation: When true, remap junit test suite names for Component Readiness routing
   - name: OC_CLUSTER_USER
     default: "kubeadmin"
     documentation: |-

ci-operator/step-registry/quay-tests/quay-interop-test/quay-tests-quay-interop-test-commands.sh

@@ -1,10 +1,5 @@
 #!/bin/bash
-
-set -o nounset
-set -o errexit
-set -o pipefail
-
-#Set Kubeconfig:
+set -euxo pipefail; shopt -s inherit_errexit
 
 echo "Quay version is ${QUAY_VERSION}"
 QUAY_VERSION_THRESHOLD="3.16"
@@ -41,8 +36,26 @@ function copyArtifacts {
 # Install Dependcies defined in packages.json
 npm install || true
 
-#Finally Copy the Junit Testing XML files and Screenshots to /tmp/artifacts
-trap copyArtifacts EXIT
+if [ "${MAP_TESTS}" = "true" ]; then
+    eval "$(
+        typeset -a _fURL=()
+        type -t wget 1>/dev/null && _fURL=(wget --timeout=30 -qO-) || _fURL=(curl --connect-timeout 10 --max-time 30 -fsSL)
+        "${_fURL[@]}" \
+            https://raw.githubusercontent.com/RedHatQE/OpenShift-LP-QE--Tools/refs/heads/main/libs/bash/ci-operator/interop/common/ExitTrap--PostProcessPrep.sh
+    )"
+    if type -t ExitTrap--PostProcessPrep 1>/dev/null; then
+        trap '
+            copyArtifacts
+            LP_IO__ET_PPP__NEW_TS_NAME="${DR__RP__CR_COMP_NAME}--%s" \
+                ExitTrap--PostProcessPrep
+        ' EXIT
+    else
+        echo "WARNING: ExitTrap--PostProcessPrep not available, falling back to copyArtifacts only" >&2
+        trap copyArtifacts EXIT
+    fi
+else
+    trap copyArtifacts EXIT
+fi
 
 #Check Quay pod status
 set +x

ci-operator/step-registry/quay-tests/quay-interop-test/quay-tests-quay-interop-test-ref.yaml

@@ -15,7 +15,13 @@ ref:
   documentation: |-
     Execute QUAY Interop Testing
   env:
-    - name: QUAY_VERSION 
-      documentation: Quay version 
+    - name: DR__RP__CR_COMP_NAME
+      default: "lp-interop--Quay"
+      documentation: Component Readiness component name for junit remapping
+    - name: MAP_TESTS
+      default: "false"
+      documentation: When true, remap junit test suite names for Component Readiness routing
+    - name: QUAY_VERSION
+      documentation: Quay version
       default: "3.17"