diff --git a/tests/e2e/common-operator-integ-suite.sh b/tests/e2e/common-operator-integ-suite.sh index f2fa8f649..2f50d7ec5 100755 --- a/tests/e2e/common-operator-integ-suite.sh +++ b/tests/e2e/common-operator-integ-suite.sh @@ -152,13 +152,14 @@ initialize_variables() { # Scenario 2: CI mode with default HUB -> use external registry with proper CI tag echo "CI mode detected for OCP, using external registry ${HUB}" export USE_INTERNAL_REGISTRY="false" - # Use PR_NUMBER if available, otherwise generate timestamp tag + # Use TARGET_ARCH to differentiate tags for different architectures in CI, avoid race conditions in CI when multiple runs are pushing to the same default tag if [ -n "${PR_NUMBER:-}" ]; then - export TAG="pr-${PR_NUMBER}" + TAG="pr-${PR_NUMBER}-${TARGET_ARCH}" + export TAG echo "Using PR-based tag: ${TAG}" else - TAG="ci-test-$(date +%s)" + TAG="ci-test-$(date +%s)-${TARGET_ARCH}" export TAG echo "Using timestamp-based tag: ${TAG}" fi