From b118ba9e9b8236a16dd7465b5d332ad2b5d17d9b Mon Sep 17 00:00:00 2001 From: Francisco Herrera Date: Tue, 10 Feb 2026 12:41:53 +0100 Subject: [PATCH 1/3] Adding TARGET_ARCH to tag definition when run on CI true Adding export TAG=pr-- when CI is true to avoid race conditions when building and pushing multiple arch jobs at the same time Signed-off-by: Francisco Herrera --- tests/e2e/common-operator-integ-suite.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/e2e/common-operator-integ-suite.sh b/tests/e2e/common-operator-integ-suite.sh index f2fa8f649..722d49738 100755 --- a/tests/e2e/common-operator-integ-suite.sh +++ b/tests/e2e/common-operator-integ-suite.sh @@ -152,15 +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}" - echo "Using PR-based tag: ${TAG}" + export TAG="pr-${PR_NUMBER}-${TARGET_ARCH}" + echo "Using PR-based tag: ${TAG}" else - TAG="ci-test-$(date +%s)" - export TAG - echo "Using timestamp-based tag: ${TAG}" + export TAG="ci-test-$(date +%s)-${TARGET_ARCH}" + echo "Using timestamp-based tag: ${TAG}" fi elif [ "${CI}" == "true" ]; then # Additional CI mode check - handle CI mode regardless of HUB value From 72d6b9fbbc11785292f7742ccbbbb4f79b1df292 Mon Sep 17 00:00:00 2001 From: Francisco Herrera Date: Tue, 10 Feb 2026 12:45:53 +0100 Subject: [PATCH 2/3] Fix lint Fix lint error: Declare and assign separately to avoid masking return values Signed-off-by: Francisco Herrera --- tests/e2e/common-operator-integ-suite.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/e2e/common-operator-integ-suite.sh b/tests/e2e/common-operator-integ-suite.sh index 722d49738..4d449dccc 100755 --- a/tests/e2e/common-operator-integ-suite.sh +++ b/tests/e2e/common-operator-integ-suite.sh @@ -155,10 +155,12 @@ initialize_variables() { # 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}-${TARGET_ARCH}" + TAG="pr-${PR_NUMBER}-${TARGET_ARCH}" + export TAG echo "Using PR-based tag: ${TAG}" else - export TAG="ci-test-$(date +%s)-${TARGET_ARCH}" + TAG="ci-test-$(date +%s)-${TARGET_ARCH}" + export TAG echo "Using timestamp-based tag: ${TAG}" fi elif [ "${CI}" == "true" ]; then From 87cb9d85940be9585e714c32daf1282f4a5d371c Mon Sep 17 00:00:00 2001 From: Francisco Herrera Date: Tue, 10 Feb 2026 13:24:30 +0100 Subject: [PATCH 3/3] Fix indent Fix indent Signed-off-by: Francisco Herrera --- tests/e2e/common-operator-integ-suite.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/e2e/common-operator-integ-suite.sh b/tests/e2e/common-operator-integ-suite.sh index 4d449dccc..2f50d7ec5 100755 --- a/tests/e2e/common-operator-integ-suite.sh +++ b/tests/e2e/common-operator-integ-suite.sh @@ -155,13 +155,13 @@ initialize_variables() { # 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 - TAG="pr-${PR_NUMBER}-${TARGET_ARCH}" - export TAG - echo "Using PR-based tag: ${TAG}" + TAG="pr-${PR_NUMBER}-${TARGET_ARCH}" + export TAG + echo "Using PR-based tag: ${TAG}" else - TAG="ci-test-$(date +%s)-${TARGET_ARCH}" - export TAG - echo "Using timestamp-based tag: ${TAG}" + TAG="ci-test-$(date +%s)-${TARGET_ARCH}" + export TAG + echo "Using timestamp-based tag: ${TAG}" fi elif [ "${CI}" == "true" ]; then # Additional CI mode check - handle CI mode regardless of HUB value