File tree Expand file tree Collapse file tree 2 files changed +20
-2
lines changed Expand file tree Collapse file tree 2 files changed +20
-2
lines changed Original file line number Diff line number Diff line change @@ -7,6 +7,15 @@ echo "Running e2e-openstack.sh"
7
7
unset GOFLAGS
8
8
tmp=" $( mktemp -d) "
9
9
10
- git clone --depth=1 " https://github.com/openshift/cluster-api-provider-openstack.git" " $tmp "
10
+ if [ " ${PULL_BASE_REF} " == " master" ]; then
11
+ # the default branch for cluster-api-provider-openstack is main.
12
+ CAPO_BASE_REF=" main"
13
+ else
14
+ CAPO_BASE_REF=$PULL_BASE_REF
15
+ fi
11
16
17
+ echo " cloning github.com/openshift/cluster-api-provider-openstack at branch '$CAPO_BASE_REF '"
18
+ git clone --single-branch --branch=" $CAPO_BASE_REF " --depth=1 " https://github.com/openshift/cluster-api-provider-openstack.git" " $tmp "
19
+
20
+ echo " running cluster-api-provider-openstack's: make -C 'openshift' e2e"
12
21
exec make -C " $tmp /openshift" e2e
Original file line number Diff line number Diff line change @@ -7,6 +7,15 @@ echo "Running e2e-tests.sh"
7
7
unset GOFLAGS
8
8
tmp=" $( mktemp -d) "
9
9
10
- git clone --depth=1 " https://github.com/openshift/cluster-capi-operator.git" " $tmp "
10
+ if [ " ${PULL_BASE_REF} " == " master" ]; then
11
+ # the default branch for cluster-capi-operator is main.
12
+ CCAPIO_BASE_REF=" main"
13
+ else
14
+ CCAPIO_BASE_REF=$PULL_BASE_REF
15
+ fi
11
16
17
+ echo " cloning github.com/openshift/cluster-capi-operator at branch '$CCAPIO_BASE_REF '"
18
+ git clone --single-branch --branch=" $CCAPIO_BASE_REF " --depth=1 " https://github.com/openshift/cluster-capi-operator.git" " $tmp "
19
+
20
+ echo " running cluster-capi-operator's: make e2e"
12
21
exec make -C " $tmp " e2e
You can’t perform that action at this time.
0 commit comments