Skip to content

Commit 5030b25

Browse files
fix: enable fast cleanup for functional tests and optimize parallelism in test execution
Signed-off-by: Dariusz Porowski <[email protected]>
1 parent 5762a76 commit 5030b25

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

.github/workflows/long-running-azure.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -692,6 +692,7 @@ jobs:
692692
BICEP_RECIPE_TAG_VERSION: ${{ env.BICEP_RECIPE_TAG_VERSION }}
693693
GH_TOKEN: ${{ steps.get_installation_token.outputs.token }}
694694
GIT_HTTP_PASSWORD: ${{ env.GIT_HTTP_PASSWORD }}
695+
RADIUS_TEST_FAST_CLEANUP: "true"
695696

696697
- name: Collect Pod details
697698
if: always()

build/test.mk

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,11 @@ test-functional-ucp: test-functional-ucp-noncloud test-functional-ucp-cloud ## R
8686

8787
.PHONY: test-functional-ucp-noncloud
8888
test-functional-ucp-noncloud: ## Runs UCP functional tests that do not require cloud resources
89-
CGO_ENABLED=1 $(GOTEST_TOOL) ./test/functional-portable/ucp/noncloud/... -timeout ${TEST_TIMEOUT} -v -parallel 5 -p 2 $(GOTEST_OPTS)
89+
CGO_ENABLED=1 $(GOTEST_TOOL) ./test/functional-portable/ucp/noncloud/... -timeout ${TEST_TIMEOUT} -v -parallel 8 -p 4 $(GOTEST_OPTS)
9090

9191
.PHONY: test-functional-ucp-cloud
9292
test-functional-ucp-cloud: ## Runs UCP functional tests that require cloud resources
93-
CGO_ENABLED=1 $(GOTEST_TOOL) ./test/functional-portable/ucp/cloud/... -timeout ${TEST_TIMEOUT} -v -parallel 5 -p 1 $(GOTEST_OPTS)
93+
CGO_ENABLED=1 $(GOTEST_TOOL) ./test/functional-portable/ucp/cloud/... -timeout ${TEST_TIMEOUT} -v -parallel 5 -p 2 $(GOTEST_OPTS)
9494

9595
.PHONY: test-functional-kubernetes
9696
test-functional-kubernetes: test-functional-kubernetes-noncloud ## Runs all Kubernetes functional tests
@@ -105,43 +105,43 @@ test-functional-corerp: test-functional-corerp-noncloud test-functional-corerp-c
105105

106106
.PHONY: test-functional-corerp-noncloud
107107
test-functional-corerp-noncloud: ## Runs corerp functional tests that do not require cloud resources
108-
CGO_ENABLED=1 $(GOTEST_TOOL) ./test/functional-portable/corerp/noncloud/... -timeout ${TEST_TIMEOUT} -v -parallel 10 -p 1 $(GOTEST_OPTS)
108+
CGO_ENABLED=1 $(GOTEST_TOOL) ./test/functional-portable/corerp/noncloud/... -timeout ${TEST_TIMEOUT} -v -parallel 15 -p 3 $(GOTEST_OPTS)
109109

110110
.PHONY: test-functional-corerp-cloud
111111
test-functional-corerp-cloud: ## Runs corerp functional tests that require cloud resources
112-
CGO_ENABLED=1 $(GOTEST_TOOL) ./test/functional-portable/corerp/cloud/... -timeout ${TEST_TIMEOUT} -v -parallel 10 -p 1 $(GOTEST_OPTS)
112+
CGO_ENABLED=1 $(GOTEST_TOOL) ./test/functional-portable/corerp/cloud/... -timeout ${TEST_TIMEOUT} -v -parallel 10 -p 2 $(GOTEST_OPTS)
113113

114114
.PHONY: test-functional-msgrp
115115
test-functional-msgrp: test-functional-msgrp-noncloud ## Runs all Messaging RP functional tests (both cloud and non-cloud)
116116

117117
.PHONY: test-functional-msgrp-noncloud
118118
test-functional-msgrp-noncloud: ## Runs Messaging RP functional tests that do not require cloud resources
119-
CGO_ENABLED=1 $(GOTEST_TOOL) ./test/functional-portable/messagingrp/noncloud/... -timeout ${TEST_TIMEOUT} -v -parallel 2 -p 2 $(GOTEST_OPTS)
119+
CGO_ENABLED=1 $(GOTEST_TOOL) ./test/functional-portable/messagingrp/noncloud/... -timeout ${TEST_TIMEOUT} -v -parallel 4 -p 4 $(GOTEST_OPTS)
120120

121121
.PHONY: test-functional-cli
122122
test-functional-cli: test-functional-cli-noncloud ## Runs all cli functional tests (both cloud and non-cloud)
123123

124124
.PHONY: test-functional-cli-noncloud
125125
test-functional-cli-noncloud: ## Runs cli functional tests that do not require cloud resources
126-
CGO_ENABLED=1 $(GOTEST_TOOL) ./test/functional-portable/cli/noncloud/... -timeout ${TEST_TIMEOUT} -v -parallel 10 -p 2 $(GOTEST_OPTS)
126+
CGO_ENABLED=1 $(GOTEST_TOOL) ./test/functional-portable/cli/noncloud/... -timeout ${TEST_TIMEOUT} -v -parallel 10 -p 4 $(GOTEST_OPTS)
127127

128128
.PHONY: test-functional-daprrp
129129
test-functional-daprrp: test-functional-daprrp-noncloud ## Runs all Dapr RP functional tests (both cloud and non-cloud)
130130

131131
.PHONY: test-functional-daprrp-noncloud
132132
test-functional-daprrp-noncloud: ## Runs Dapr RP functional tests that do not require cloud resources
133-
CGO_ENABLED=1 $(GOTEST_TOOL) ./test/functional-portable/daprrp/noncloud/... -timeout ${TEST_TIMEOUT} -v -parallel 3 -p 1 $(GOTEST_OPTS)
133+
CGO_ENABLED=1 $(GOTEST_TOOL) ./test/functional-portable/daprrp/noncloud/... -timeout ${TEST_TIMEOUT} -v -parallel 5 -p 2 $(GOTEST_OPTS)
134134

135135
.PHONY: test-functional-datastoresrp
136136
test-functional-datastoresrp: test-functional-datastoresrp-noncloud ## Runs all Datastores RP functional tests (non-cloud)
137137

138138
.PHONY: test-functional-datastoresrp-noncloud
139139
test-functional-datastoresrp-noncloud: ## Runs Datastores RP functional tests that do not require cloud resources
140-
CGO_ENABLED=1 $(GOTEST_TOOL) ./test/functional-portable/datastoresrp/noncloud/... -timeout ${TEST_TIMEOUT} -v -parallel 3 -p 2 $(GOTEST_OPTS)
140+
CGO_ENABLED=1 $(GOTEST_TOOL) ./test/functional-portable/datastoresrp/noncloud/... -timeout ${TEST_TIMEOUT} -v -parallel 5 -p 4 $(GOTEST_OPTS)
141141

142142
.PHONY: test-functional-dynamicrp-noncloud
143143
test-functional-dynamicrp-noncloud: ## Runs Dynamic RP functional tests that do not require cloud resources
144-
CGO_ENABLED=1 $(GOTEST_TOOL) ./test/functional-portable/dynamicrp/noncloud/... -timeout ${TEST_TIMEOUT} -v -parallel 1 -p 2 $(GOTEST_OPTS)
144+
CGO_ENABLED=1 $(GOTEST_TOOL) ./test/functional-portable/dynamicrp/noncloud/... -timeout ${TEST_TIMEOUT} -v -parallel 3 -p 2 $(GOTEST_OPTS)
145145

146146
.PHONY: test-functional-upgrade
147147
test-functional-upgrade: test-functional-upgrade-noncloud ## Runs all Upgrade functional tests
@@ -155,7 +155,7 @@ test-functional-samples: test-functional-samples-noncloud ## Runs all Samples fu
155155

156156
.PHONY: test-functional-samples-noncloud
157157
test-functional-samples-noncloud: ## Runs Samples functional tests that do not require cloud resources
158-
CGO_ENABLED=1 $(GOTEST_TOOL) ./test/functional-portable/samples/noncloud/... -timeout ${TEST_TIMEOUT} -v -parallel 5 -p 2 $(GOTEST_OPTS)
158+
CGO_ENABLED=1 $(GOTEST_TOOL) ./test/functional-portable/samples/noncloud/... -timeout ${TEST_TIMEOUT} -v -parallel 8 -p 4 $(GOTEST_OPTS)
159159

160160
.PHONY: test-validate-bicep
161161
test-validate-bicep: ## Validates that all .bicep files compile cleanly

0 commit comments

Comments
 (0)