Skip to content

OCPBUGS-53005: Remove references to master branch #235

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

OCPBUGS-53005: Remove references to master branch #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 2 additions & 6 deletions openshift/e2e-openstack.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 2 additions & 6 deletions openshift/e2e-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down