From 5ef6e2e172a4390f68d6653b0cc470efcb4d9f4f Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Fri, 5 Dec 2025 15:03:04 +0000 Subject: [PATCH] UPSTREAM: : Revert "Reference main branch for CI" This reverts commit a7cb24b467beb7e05a8f4aee8e89e269a9338ad6. openshift/release still uses "master" as the branch name. Absence of this logic prevent rehearsals. --- openshift/e2e-tests.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/openshift/e2e-tests.sh b/openshift/e2e-tests.sh index 2aaf64225a..27d8509575 100755 --- a/openshift/e2e-tests.sh +++ b/openshift/e2e-tests.sh @@ -7,8 +7,12 @@ echo "Running e2e-tests.sh" unset GOFLAGS tmp="$(mktemp -d)" -# Default branch for both CCAPIO and this repo should be `main`. -CCAPIO_BASE_REF=$PULL_BASE_REF +if [ "${PULL_BASE_REF}" == "master" ]; then + # the default branch for cluster-capi-operator is main. + CCAPIO_BASE_REF="main" +else + CCAPIO_BASE_REF=$PULL_BASE_REF +fi echo "cloning github.com/openshift/cluster-capi-operator at branch '$CCAPIO_BASE_REF'" git clone --single-branch --branch="$CCAPIO_BASE_REF" --depth=1 "https://github.com/openshift/cluster-capi-operator.git" "$tmp"