Skip to content

Commit e2395ed

Browse files
authored
Increase assert timeout for e2e test in GHA (#711)
1 parent 63d27d1 commit e2395ed

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

.github/workflows/build_test_ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ jobs:
111111
secrets: inherit
112112
with:
113113
e2e-selector: ${{ matrix.flavor }}
114-
e2e-flags: ${{ matrix.flavor == 'quick' && '' || '--assert-timeout 15m0s'}}
114+
e2e-flags: ${{ matrix.flavor == 'quick' && '' || '--assert-timeout 20m0s'}}
115115

116116

117117
docker-build:

.github/workflows/e2e-upgrade-test.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ jobs:
8787
LINODE_CONTROL_PLANE_MACHINE_TYPE: g6-standard-2
8888
LINODE_MACHINE_TYPE: g6-standard-2
8989
CLUSTERCTL_CONFIG: /home/runner/work/cluster-api-provider-linode/cluster-api-provider-linode/e2e/gha-clusterctl-config.yaml
90+
E2E_FLAGS: --assert-timeout 20m0s
9091
run: make test-upgrade
9192

9293
- name: cleanup stale clusters

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ test: generate fmt vet envtest ## Run tests.
157157

158158
.PHONY: e2etest
159159
e2etest: generate local-release local-deploy chainsaw s5cmd
160-
GIT_REF=$(GIT_REF) SSE_KEY=$$(openssl rand -base64 32) LOCALBIN=$(CACHE_BIN) $(CHAINSAW) test ./e2e --selector $(E2E_SELECTOR) $(E2E_FLAGS)
160+
GIT_REF=$(GIT_REF) SSE_KEY=$$(openssl rand -base64 32) LOCALBIN=$(CACHE_BIN) $(CHAINSAW) test ./e2e --parallel 2 --selector $(E2E_SELECTOR) $(E2E_FLAGS)
161161

162162
.PHONY: local-deploy
163163
local-deploy: kind-cluster tilt kustomize clusterctl
@@ -190,7 +190,7 @@ last-release-cluster: kind ctlptl tilt kustomize clusterctl chainsaw kind-cluste
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) --assert-timeout 600s ./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 800s ./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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,10 @@ spec:
146146
echo "Skipping deletion of child cluster"
147147
exit 0
148148
fi
149-
kubectl delete cluster $CLUSTER -n $NAMESPACE --timeout=60s || { echo "deletion failed!"; exit 1; }
150-
kubectl delete linodevpc $CLUSTER -n $NAMESPACE --timeout=60s || { echo "deletion failed!"; exit 1; }
151-
kubectl delete linodefirewall $CLUSTER -n $NAMESPACE --timeout=60s || { echo "deletion failed!"; exit 1; }
152-
kubectl delete linodefirewall $CLUSTER-nb -n $NAMESPACE --timeout=60s || { echo "deletion failed!"; exit 1; }
149+
kubectl delete cluster $CLUSTER -n $NAMESPACE --timeout=120s || { echo "deletion failed!"; exit 1; }
150+
kubectl delete linodevpc $CLUSTER -n $NAMESPACE --timeout=120s || { echo "deletion failed!"; exit 1; }
151+
kubectl delete linodefirewall $CLUSTER -n $NAMESPACE --timeout=120s || { echo "deletion failed!"; exit 1; }
152+
kubectl delete linodefirewall $CLUSTER-nb -n $NAMESPACE --timeout=120s || { echo "deletion failed!"; exit 1; }
153153
check:
154154
($error == null): true
155155
(contains($stdout, 'deletion failed')): false

0 commit comments

Comments
 (0)