e2e conformance: add the env var RUN_ON_ARM64_INFRA

Set the RUN_ON_ARM64_INFRA to make the conformance tests run without the tests that are not supported on the Arm64 test infrastructure. Signed-off-by: howard zhang <[email protected]>
cnchef · Oct 26, 2023 · 4624369 · 4624369
1 parent c88dd5f
commit 4624369
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -99,7 +99,7 @@ functest-image-push: functest-image-build
 	hack/func-tests-image.sh push
 
 conformance:
-	hack/dockerized "export KUBEVIRT_PROVIDER=${KUBEVIRT_PROVIDER} SKIP_OUTSIDE_CONN_TESTS=${SKIP_OUTSIDE_CONN_TESTS} KUBEVIRT_E2E_FOCUS=${KUBEVIRT_E2E_FOCUS} DOCKER_PREFIX=${DOCKER_PREFIX} DOCKER_TAG=${DOCKER_TAG} && hack/conformance.sh"
+	hack/dockerized "export KUBEVIRT_PROVIDER=${KUBEVIRT_PROVIDER} SKIP_OUTSIDE_CONN_TESTS=${SKIP_OUTSIDE_CONN_TESTS} RUN_ON_ARM64_INFRA=${RUN_ON_ARM64_INFRA} KUBEVIRT_E2E_FOCUS=${KUBEVIRT_E2E_FOCUS} DOCKER_PREFIX=${DOCKER_PREFIX} DOCKER_TAG=${DOCKER_TAG} && hack/conformance.sh"
 
 perftest: build-functests
 	hack/perftests.sh

diff --git a/docs/conformance.md b/docs/conformance.md
@@ -73,6 +73,14 @@ To run without outside connectivity tests add the argument:
 SKIP_OUTSIDE_CONN_TESTS=true make conformance
 ```
 
+The following argument is only used for running the conformance tests on the Arm64 test infrastructure in KubeVirtCI.
+This is necessary because some specific setups, such as IPv6, are not enabled on the Arm64 test infrastructure.
+By adding the argument, we can skip the unsupported tests.
+
+```bash
+RUN_ON_ARM64_INFRA=true make conformance
+```
+
 To focus on specific tests pass KUBEVIRT_E2E_FOCUS argument:
 
 ```bash

diff --git a/hack/conformance.sh b/hack/conformance.sh
@@ -29,6 +29,10 @@ if [[ ! -z "$SKIP_OUTSIDE_CONN_TESTS" ]]; then
     sonobuoy_args="${sonobuoy_args} --plugin-env kubevirt-conformance.E2E_SKIP=\[outside_connectivity\]"
 fi
 
+if [[ ! -z "$RUN_ON_ARM64_INFRA" ]]; then
+    sonobuoy_args="${sonobuoy_args} --plugin-env kubevirt-conformance.E2E_SKIP=.*(\[outside_connectivity\].*\[IPv6\].*|\[IPv6\].*\[outside_connectivity\].*).*"
+fi
+
 if [[ ! -z "$KUBEVIRT_PROVIDER" ]]; then
     sonobuoy_args="${sonobuoy_args} --plugin-env kubevirt-conformance.KUBEVIRT_PROVIDER=${KUBEVIRT_PROVIDER}"
 fi