From b7e6e675ef00c827c68b76974082a94033a116c8 Mon Sep 17 00:00:00 2001 From: Elijah Omolo Date: Mon, 25 Nov 2024 16:59:54 -0500 Subject: [PATCH 1/3] enable xfs mount test --- test/e2e/run-versioned-e2e-tests.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/e2e/run-versioned-e2e-tests.sh b/test/e2e/run-versioned-e2e-tests.sh index 9d487600b..49d3513c5 100755 --- a/test/e2e/run-versioned-e2e-tests.sh +++ b/test/e2e/run-versioned-e2e-tests.sh @@ -64,9 +64,9 @@ else "ginkgo-${KUBE_VER}" -v -p -nodes "${GINKGO_NODES:-$DEFAULT_GINKGO_NODES}" -focus="External.Storage${focus}.*" -skip='\[Feature:|\[Disruptive\]|\[Serial\]' "${E2E_TEST_FILE}" -- "-storage.testdriver=${TD_FILE}" fi -if [[ "${SKIP_SEQUENTIAL_TESTS:-}" ]]; then - echo 'Skipping sequential tests' -else - echo 'Running sequential tests' - "ginkgo-${KUBE_VER}" -v -focus="External.Storage${focus}.*(\[Feature:|\[Serial\])" -skip='\[Disruptive\]|\[Feature:VolumeSourceXFS\]' "${E2E_TEST_FILE}" -- "-storage.testdriver=${TD_FILE}" -fi +#if [[ "${SKIP_SEQUENTIAL_TESTS:-}" ]]; then +# echo 'Skipping sequential tests' +#else +# echo 'Running sequential tests' +# "ginkgo-${KUBE_VER}" -v -focus="External.Storage${focus}.*(\[Feature:|\[Serial\])" -skip='\[Disruptive\]|\[Feature:VolumeSourceXFS\]' "${E2E_TEST_FILE}" -- "-storage.testdriver=${TD_FILE}" +#fi From 121488b01bea264b2ea47853f2c683c388641e22 Mon Sep 17 00:00:00 2001 From: Elijah Omolo Date: Tue, 26 Nov 2024 11:26:20 -0500 Subject: [PATCH 2/3] drop skip serialized tests --- test/e2e/run-versioned-e2e-tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/run-versioned-e2e-tests.sh b/test/e2e/run-versioned-e2e-tests.sh index 49d3513c5..00e996798 100755 --- a/test/e2e/run-versioned-e2e-tests.sh +++ b/test/e2e/run-versioned-e2e-tests.sh @@ -61,7 +61,7 @@ else echo 'Running parallel tests' # Set node count explicitly since node detection does not work properly inside a # container. - "ginkgo-${KUBE_VER}" -v -p -nodes "${GINKGO_NODES:-$DEFAULT_GINKGO_NODES}" -focus="External.Storage${focus}.*" -skip='\[Feature:|\[Disruptive\]|\[Serial\]' "${E2E_TEST_FILE}" -- "-storage.testdriver=${TD_FILE}" + "ginkgo-${KUBE_VER}" -v -p -nodes "${GINKGO_NODES:-$DEFAULT_GINKGO_NODES}" -focus="External.Storage${focus}.*" "${E2E_TEST_FILE}" -- "-storage.testdriver=${TD_FILE}" fi #if [[ "${SKIP_SEQUENTIAL_TESTS:-}" ]]; then From ff118a07f207061ab7474feb16d2a76d71d9a59d Mon Sep 17 00:00:00 2001 From: Elijah Omolo Date: Tue, 26 Nov 2024 11:37:18 -0500 Subject: [PATCH 3/3] refactor sequential tests condition --- test/e2e/run-versioned-e2e-tests.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/e2e/run-versioned-e2e-tests.sh b/test/e2e/run-versioned-e2e-tests.sh index 00e996798..b646c1ed4 100755 --- a/test/e2e/run-versioned-e2e-tests.sh +++ b/test/e2e/run-versioned-e2e-tests.sh @@ -64,9 +64,9 @@ else "ginkgo-${KUBE_VER}" -v -p -nodes "${GINKGO_NODES:-$DEFAULT_GINKGO_NODES}" -focus="External.Storage${focus}.*" "${E2E_TEST_FILE}" -- "-storage.testdriver=${TD_FILE}" fi -#if [[ "${SKIP_SEQUENTIAL_TESTS:-}" ]]; then -# echo 'Skipping sequential tests' -#else -# echo 'Running sequential tests' -# "ginkgo-${KUBE_VER}" -v -focus="External.Storage${focus}.*(\[Feature:|\[Serial\])" -skip='\[Disruptive\]|\[Feature:VolumeSourceXFS\]' "${E2E_TEST_FILE}" -- "-storage.testdriver=${TD_FILE}" -#fi +if [[ "${SKIP_SEQUENTIAL_TESTS:-}" ]]; then + echo 'Skipping sequential tests' +else + echo 'Running sequential tests' + "ginkgo-${KUBE_VER}" -v -focus="External.Storage${focus}.*(\[Feature:|\[Serial\])" -skip='\[Disruptive\]' "${E2E_TEST_FILE}" -- "-storage.testdriver=${TD_FILE}" +fi