diff --git a/openshift/e2e-openstack.sh b/openshift/e2e-openstack.sh index c1e74c35a0e1..261690a70559 100755 --- a/openshift/e2e-openstack.sh +++ b/openshift/e2e-openstack.sh @@ -7,12 +7,8 @@ echo "Running e2e-openstack.sh" unset GOFLAGS tmp="$(mktemp -d)" -if [ "${PULL_BASE_REF}" == "master" ]; then - # the default branch for cluster-api-provider-openstack is main. - CAPO_BASE_REF="main" -else - CAPO_BASE_REF=$PULL_BASE_REF -fi +# Default branch for both CAPO and this repo should be `main`. +CAPO_BASE_REF=$PULL_BASE_REF echo "cloning github.com/openshift/cluster-api-provider-openstack at branch '$CAPO_BASE_REF'" git clone --single-branch --branch="$CAPO_BASE_REF" --depth=1 "https://github.com/openshift/cluster-api-provider-openstack.git" "$tmp" diff --git a/openshift/e2e-tests.sh b/openshift/e2e-tests.sh index 27d850957544..2aaf64225a27 100755 --- a/openshift/e2e-tests.sh +++ b/openshift/e2e-tests.sh @@ -7,12 +7,8 @@ echo "Running e2e-tests.sh" unset GOFLAGS tmp="$(mktemp -d)" -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 +# Default branch for both CCAPIO and this repo should be `main`. +CCAPIO_BASE_REF=$PULL_BASE_REF 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"