Skip to content

Commit 5aaa277

Browse files
committed
test: enable using custom flavor for conformance test
- Enables configuring custom flavor for conformance tests using CONFORMANCE_FLAVOR - Added dual-stack ginkgo v2 kubetest config Signed-off-by: Anish Ramasekar <[email protected]>
1 parent f9a6449 commit 5aaa277

File tree

4 files changed

+56
-43
lines changed

4 files changed

+56
-43
lines changed

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -674,11 +674,12 @@ test-e2e-local: ## Run "docker-build" rule then run e2e tests.
674674
GINKGO_ARGS='$(LOCAL_GINKGO_ARGS)' \
675675
test-e2e-run
676676

677+
CONFORMANCE_FLAVOR ?=
677678
CONFORMANCE_E2E_ARGS ?= -kubetest.config-file=$(KUBETEST_CONF_PATH)
678679
CONFORMANCE_E2E_ARGS += $(E2E_ARGS)
679680
.PHONY: test-conformance
680681
test-conformance: ## Run conformance test on workload cluster.
681-
$(MAKE) test-e2e-local GINKGO_FOCUS="Conformance" E2E_ARGS='$(CONFORMANCE_E2E_ARGS)' GINKGO_ARGS='$(LOCAL_GINKGO_ARGS)'
682+
$(MAKE) test-e2e-local GINKGO_FOCUS="Conformance" E2E_ARGS='$(CONFORMANCE_E2E_ARGS)' GINKGO_ARGS='$(LOCAL_GINKGO_ARGS)' CONFORMANCE_FLAVOR='$(CONFORMANCE_FLAVOR)'
682683

683684
test-conformance-fast: ## Run conformance test on workload cluster using a subset of the conformance suite in parallel.
684685
$(MAKE) test-conformance CONFORMANCE_E2E_ARGS="-kubetest.config-file=$(KUBETEST_FAST_CONF_PATH) -kubetest.ginkgo-nodes=5 $(E2E_ARGS)"

0 commit comments

Comments
 (0)