Skip to content

[release-1.27] fix(e2e): Add cleanup trap to prevent false positives in CI test runs #1232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 6, 2025
Merged

[release-1.27] fix(e2e): Add cleanup trap to prevent false positives in CI test runs #1232

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
49ef877
fix(e2e): Add cleanup trap to prevent false positives in CI test runs
fjglira Sep 18, 2025
2f35b72
TEMPORARY FAILURE
fjglira Sep 18, 2025
6b22ca1
Fix lint
fjglira Sep 18, 2025
62ca7fe
Revert "TEMPORARY FAILURE"
fjglira Sep 18, 2025
743396d
Merge branch 'release-1.27' into cherry-pick-1227-to-release-1.27
fjglira Oct 6, 2025
8ff0e84
Fix lint issues
fjglira Oct 6, 2025
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
37 changes: 23 additions & 14 deletions tests/e2e/common-operator-integ-suite.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,12 +183,32 @@ await_operator() {
"${COMMAND}" wait --for=condition=available deployment/"${DEPLOYMENT_NAME}" -n "${NAMESPACE}" --timeout=5m
}

# shellcheck disable=SC2329,SC2317 # Function is invoked indirectly via trap
uninstall_operator() {
echo "Uninstalling sail-operator (KUBECONFIG=${KUBECONFIG})"
helm uninstall sail-operator --namespace "${NAMESPACE}"
"${COMMAND}" delete namespace "${NAMESPACE}"
}

# Ensure cleanup always runs and that the original test exit code is preserved
# shellcheck disable=SC2329,SC2317 # Function is invoked indirectly via trap
cleanup() {
# Do not let cleanup errors affect the final exit code
set +e
if [ "${OLM}" != "true" ] && [ "${SKIP_DEPLOY}" != "true" ]; then
if [ "${MULTICLUSTER}" == true ]; then
KUBECONFIG="${KUBECONFIG}" uninstall_operator || true
# shellcheck disable=SC2153 # KUBECONFIG2 is set by multicluster setup scripts
KUBECONFIG="${KUBECONFIG2}" uninstall_operator || true
else
uninstall_operator || true
fi
fi
echo "JUnit report: ${ARTIFACTS}/report.xml"
}

trap cleanup EXIT INT TERM

# Main script flow
check_arguments "$@"
parse_flags "$@"
Expand Down Expand Up @@ -272,24 +292,13 @@ fi
check_cluster_operators

set +e
# Disable to avoid fail the test run and not generate the report.xml
# We need to catch the exit code to be able to generate the report
# Disable to avoid failing the test run before generating the report.xml
# Capture the test exit code and allow cleanup via trap to run
# shellcheck disable=SC2086
IMAGE="${HUB}/${IMAGE_BASE}:${TAG}" \
go run github.com/onsi/ginkgo/v2/ginkgo -tags e2e \
--timeout 60m --junit-report="${ARTIFACTS}/report.xml" ${GINKGO_FLAGS:-} "${WD}"/...
TEST_EXIT_CODE=$?
set -e

if [ "${OLM}" != "true" ] && [ "${SKIP_DEPLOY}" != "true" ]; then
if [ "${MULTICLUSTER}" == true ]; then
KUBECONFIG="${KUBECONFIG}" uninstall_operator
KUBECONFIG="${KUBECONFIG2}" uninstall_operator
else
uninstall_operator
fi
fi


echo "JUnit report: ${ARTIFACTS}/report.xml"
exit ${TEST_EXIT_CODE}
exit ${TEST_EXIT_CODE}