Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions ci-operator/step-registry/acm/opp-app/acm-opp-app-commands.sh
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,24 @@ RunTestCase2() {
# Set trap to generate JUnit XML on exit (regardless of success or failure)
trap GenerateJunitXml 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 '
GenerateJunitXml
LP_IO__ET_PPP__NEW_TS_NAME="${DR__RP__CR_COMP_NAME}--%s" \
ExitTrap--PostProcessPrep junit--acm-opp-app.xml
' EXIT
else
: "WARNING: ExitTrap--PostProcessPrep not available, skipping junit remapping"
fi
fi

################################################################################
# Pre-flight Checks
################################################################################
Expand Down
7 changes: 7 additions & 0 deletions ci-operator/step-registry/acm/opp-app/acm-opp-app-ref.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,12 @@ ref:
requests:
cpu: 10m
memory: 100Mi
env:
- name: DR__RP__CR_COMP_NAME
default: "lp-interop--OPP"
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
documentation: |-
Deploys an application that influences and/or uses all components of the OPP bundle.
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ if [ "${MAP_TESTS}" = "true" ]; then
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
ExitTrap--PostProcessPrep junit--acm-observability.xml
' EXIT
else
echo "WARNING: ExitTrap--PostProcessPrep not available, skipping junit remapping" >&2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ if [ "${MAP_TESTS}" = "true" ]; then
trap '
copyArtifacts
LP_IO__ET_PPP__NEW_TS_NAME="${DR__RP__CR_COMP_NAME}--%s" \
ExitTrap--PostProcessPrep
ExitTrap--PostProcessPrep junit--quay-interop-test.xml
' EXIT
else
echo "WARNING: ExitTrap--PostProcessPrep not available, falling back to copyArtifacts only" >&2
Expand Down