Skip to content

Commit 231103b

Browse files
author
Rahul Sharma
committed
increase assert timeout to fix test failures
1 parent ea8b740 commit 231103b

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,13 +184,13 @@ checkout-last-release:
184184

185185
.PHONY: last-release-cluster
186186
last-release-cluster: kind ctlptl tilt kustomize clusterctl chainsaw kind-cluster checkout-last-release local-release local-deploy
187-
GIT_REF=$(COMMON_CLUSTER_REF) LOCALBIN=$(CACHE_BIN) CLUSTERCTL_CONFIG=$(CLUSTERCTL_CONFIG) $(CHAINSAW) test --namespace $(COMMON_NAMESPACE) ./e2e/capl-cluster-flavors/kubeadm-capl-cluster
187+
GIT_REF=$(COMMON_CLUSTER_REF) LOCALBIN=$(CACHE_BIN) CLUSTERCTL_CONFIG=$(CLUSTERCTL_CONFIG) $(CHAINSAW) test --namespace $(COMMON_NAMESPACE) --assert-timeout 600s ./e2e/capl-cluster-flavors/kubeadm-capl-cluster
188188

189189
.PHONY: test-upgrade
190190
test-upgrade: last-release-cluster checkout-latest-commit
191191
$(MAKE) local-release
192192
$(MAKE) local-deploy
193-
GIT_REF=$(COMMON_CLUSTER_REF) LOCALBIN=$(CACHE_BIN) CLUSTERCTL_CONFIG=$(CLUSTERCTL_CONFIG) $(CHAINSAW) test --namespace $(COMMON_NAMESPACE) ./e2e/capl-cluster-flavors/kubeadm-capl-cluster
193+
GIT_REF=$(COMMON_CLUSTER_REF) LOCALBIN=$(CACHE_BIN) CLUSTERCTL_CONFIG=$(CLUSTERCTL_CONFIG) $(CHAINSAW) test --namespace $(COMMON_NAMESPACE) --assert-timeout 600s ./e2e/capl-cluster-flavors/kubeadm-capl-cluster
194194

195195
.PHONY: clean-kind-cluster
196196
clean-kind-cluster: ctlptl

e2e/capl-cluster-flavors/kubeadm-capl-cluster/chainsaw-test.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,12 @@ spec:
3535
value: ($namespace)
3636
- name: CLUSTERCTL_CONFIG
3737
value: (env('CLUSTERCTL_CONFIG'))
38+
- name: KUBERNETES_VERSION
39+
value: (env('KUBERNETES_VERSION') || 'v1.29.1')
3840
content: |
3941
set -e
4042
clusterctl generate cluster $CLUSTER -n $NAMESPACE \
41-
--kubernetes-version v1.29.1 \
43+
--kubernetes-version $KUBERNETES_VERSION \
4244
--infrastructure local-linode:v0.0.0 \
4345
--control-plane-machine-count 1 --worker-machine-count 1 \
4446
--config ${CLUSTERCTL_CONFIG:=${HOME}/.cluster-api/clusterctl.yaml} > default-cluster.yaml

0 commit comments

Comments
 (0)