Skip to content

Commit 6bb86de

Browse files
authored
Merge pull request #362 from npinaeva/ci-timeout
[conformance] increase test timeout due to the added retries
2 parents 412bf65 + aaf8f5f commit 6bb86de

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

.github/workflows/conformance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ jobs:
114114
run: |
115115
go mod download
116116
REPO_VERSION=$(git describe --always --dirty)
117-
go test -v ./conformance -run TestConformanceProfiles -args --conformance-profiles=ClusterNetworkPolicy --organization=kubernetes --project=kube-network-policies --url=https://github.com/kubernetes-sigs/kube-network-policies --version=${REPO_VERSION} --contact=https://github.com/kubernetes-sigs/kube-network-policies/issues/new --additional-info=https://github.com/kubernetes-sigs/kube-network-policies
117+
go test -v ./conformance -run TestConformanceProfiles -timeout 20m -args --conformance-profiles=ClusterNetworkPolicy --organization=kubernetes --project=kube-network-policies --url=https://github.com/kubernetes-sigs/kube-network-policies --version=${REPO_VERSION} --contact=https://github.com/kubernetes-sigs/kube-network-policies/issues/new --additional-info=https://github.com/kubernetes-sigs/kube-network-policies
118118
119119
- name: Upload Junit Reports
120120
if: always()

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,17 +59,17 @@ crd-e2e: ## Run the CRD e2e tests.
5959
.PHONY: conformance
6060
conformance: ## Run the conformance tests.
6161
go test ${GO_TEST_FLAGS} -v ./conformance \
62-
-run '^TestConformance$$' -args ${CONFORMANCE_FLAGS}
62+
-run '^TestConformance$$' -timeout 20m -args ${CONFORMANCE_FLAGS}
6363

6464
.PHONY: conformance-profiles
6565
conformance-profiles: ## Run the conformance profiles.
6666
go test ${GO_TEST_FLAGS} -v ./conformance \
67-
-run '^TestConformanceProfiles$$' -args ${CONFORMANCE_FLAGS}
67+
-run '^TestConformanceProfiles$$' -timeout 20m -args ${CONFORMANCE_FLAGS}
6868

6969
.PHONY: conformance-profiles-default
7070
conformance-profiles-default: ## Run the default conformance profile.
7171
go test ${GO_TEST_FLAGS} -v ./conformance \
72-
-run '^TestConformanceProfiles$$' -args \
72+
-run '^TestConformanceProfiles$$' -timeout 20m -args \
7373
--conformance-profiles=ClusterNetworkPolicy
7474

7575
##@ Deployment

0 commit comments

Comments
 (0)