From 33c8b7b6b059acfba8a481bd973203826f475127 Mon Sep 17 00:00:00 2001 From: zhzhuang-zju Date: Mon, 17 Feb 2025 10:05:01 +0800 Subject: [PATCH] Refactor the e2e test architecture Signed-off-by: zhzhuang-zju --- .github/workflows/installation-cli.yaml | 4 ++-- .github/workflows/installation-operator.yaml | 2 +- hack/run-e2e.sh | 2 +- test/e2e/{ => suites/base}/aggregatedapi_test.go | 2 +- test/e2e/{ => suites/base}/clusteraffinities_test.go | 2 +- test/e2e/{ => suites/base}/clusteroverridepolicy_test.go | 2 +- test/e2e/{ => suites/base}/clusterpropagationpolicy_test.go | 2 +- test/e2e/{ => suites/base}/clusterresourcebinding_test.go | 2 +- test/e2e/{ => suites/base}/coverage_docs/E2E_coverage.md | 0 .../e2e/{ => suites/base}/coverage_docs/aggregatedapi_test.md | 0 .../{ => suites/base}/coverage_docs/clusteraffinities_test.md | 0 .../base}/coverage_docs/clusteroverridepolicy_test.md | 0 .../base}/coverage_docs/clusterpropagationpolicy_test.md | 0 .../{ => suites/base}/coverage_docs/cronfederatedhpa_test.md | 0 .../base}/coverage_docs/dependenciesdistributor_test.md | 0 test/e2e/{ => suites/base}/coverage_docs/failover_test.md | 0 .../base}/coverage_docs/federatedresourcequota_test.md | 0 .../e2e/{ => suites/base}/coverage_docs/fieldselector_test.md | 0 .../{ => suites/base}/coverage_docs/hpareplicassyncer_test.md | 0 test/e2e/{ => suites/base}/coverage_docs/karmadactl_test.md | 0 test/e2e/{ => suites/base}/coverage_docs/mcs_test.md | 0 test/e2e/{ => suites/base}/coverage_docs/namespace_test.md | 0 .../{ => suites/base}/coverage_docs/overridepolicy_test.md | 0 .../{ => suites/base}/coverage_docs/porting_workloads_test.md | 0 .../{ => suites/base}/coverage_docs/propagationpolicy_test.md | 0 test/e2e/{ => suites/base}/coverage_docs/rescheduling_test.md | 0 .../base}/coverage_docs/resource_deletion_protection_test.md | 0 test/e2e/{ => suites/base}/coverage_docs/resource_test.md | 0 .../base}/coverage_docs/resourceinterpreter_test.md | 0 test/e2e/{ => suites/base}/coverage_docs/scheduling_test.md | 0 .../base}/coverage_docs/seamless_migration_test.md | 0 test/e2e/{ => suites/base}/coverage_docs/search_test.md | 0 .../{ => suites/base}/coverage_docs/spread_by_region_test.md | 0 .../{ => suites/base}/coverage_docs/tainttoleration_test.md | 0 test/e2e/{ => suites/base}/cronfederatedhpa_test.go | 2 +- test/e2e/{ => suites/base}/dependenciesdistributor_test.go | 2 +- test/e2e/{ => suites/base}/deploymentreplicassyncer_test.go | 2 +- test/e2e/{ => suites/base}/failover_test.go | 2 +- test/e2e/{ => suites/base}/federatedhpa_test.go | 2 +- test/e2e/{ => suites/base}/federatedresourcequota_test.go | 2 +- test/e2e/{ => suites/base}/fieldselector_test.go | 2 +- test/e2e/{ => suites/base}/karmadactl_test.go | 2 +- test/e2e/{ => suites/base}/lazy_activation_policy_test.go | 2 +- test/e2e/{ => suites/base}/mcs_test.go | 2 +- test/e2e/{ => suites/base}/metrics_test.go | 2 +- test/e2e/{ => suites/base}/migration_and_rollback_test.go | 2 +- test/e2e/{ => suites/base}/namespace_test.go | 2 +- test/e2e/{ => suites/base}/overridepolicy_test.go | 2 +- test/e2e/{ => suites/base}/porting_workloads_test.go | 2 +- test/e2e/{ => suites/base}/preemption_test.go | 2 +- test/e2e/{ => suites/base}/propagationpolicy_test.go | 2 +- test/e2e/{ => suites/base}/remedy_test.go | 2 +- test/e2e/{ => suites/base}/rescheduling_test.go | 2 +- .../{ => suites/base}/resource_deletion_protection_test.go | 2 +- test/e2e/{ => suites/base}/resource_test.go | 2 +- test/e2e/{ => suites/base}/resourceinterpreter_test.go | 2 +- test/e2e/{ => suites/base}/scheduling_test.go | 2 +- test/e2e/{ => suites/base}/search_test.go | 2 +- test/e2e/{ => suites/base}/spread_by_region_test.go | 2 +- test/e2e/{ => suites/base}/suite.go | 2 +- test/e2e/{ => suites/base}/suite_log_test.go | 2 +- test/e2e/{ => suites/base}/suite_test.go | 4 ++-- test/e2e/{ => suites/base}/tainttoleration_test.go | 2 +- test/e2e/{ => suites/base}/workloadrebalancer_test.go | 2 +- 64 files changed, 40 insertions(+), 40 deletions(-) rename test/e2e/{ => suites/base}/aggregatedapi_test.go (99%) rename test/e2e/{ => suites/base}/clusteraffinities_test.go (99%) rename test/e2e/{ => suites/base}/clusteroverridepolicy_test.go (99%) rename test/e2e/{ => suites/base}/clusterpropagationpolicy_test.go (99%) rename test/e2e/{ => suites/base}/clusterresourcebinding_test.go (99%) rename test/e2e/{ => suites/base}/coverage_docs/E2E_coverage.md (100%) rename test/e2e/{ => suites/base}/coverage_docs/aggregatedapi_test.md (100%) rename test/e2e/{ => suites/base}/coverage_docs/clusteraffinities_test.md (100%) rename test/e2e/{ => suites/base}/coverage_docs/clusteroverridepolicy_test.md (100%) rename test/e2e/{ => suites/base}/coverage_docs/clusterpropagationpolicy_test.md (100%) rename test/e2e/{ => suites/base}/coverage_docs/cronfederatedhpa_test.md (100%) rename test/e2e/{ => suites/base}/coverage_docs/dependenciesdistributor_test.md (100%) rename test/e2e/{ => suites/base}/coverage_docs/failover_test.md (100%) rename test/e2e/{ => suites/base}/coverage_docs/federatedresourcequota_test.md (100%) rename test/e2e/{ => suites/base}/coverage_docs/fieldselector_test.md (100%) rename test/e2e/{ => suites/base}/coverage_docs/hpareplicassyncer_test.md (100%) rename test/e2e/{ => suites/base}/coverage_docs/karmadactl_test.md (100%) rename test/e2e/{ => suites/base}/coverage_docs/mcs_test.md (100%) rename test/e2e/{ => suites/base}/coverage_docs/namespace_test.md (100%) rename test/e2e/{ => suites/base}/coverage_docs/overridepolicy_test.md (100%) rename test/e2e/{ => suites/base}/coverage_docs/porting_workloads_test.md (100%) rename test/e2e/{ => suites/base}/coverage_docs/propagationpolicy_test.md (100%) rename test/e2e/{ => suites/base}/coverage_docs/rescheduling_test.md (100%) rename test/e2e/{ => suites/base}/coverage_docs/resource_deletion_protection_test.md (100%) rename test/e2e/{ => suites/base}/coverage_docs/resource_test.md (100%) rename test/e2e/{ => suites/base}/coverage_docs/resourceinterpreter_test.md (100%) rename test/e2e/{ => suites/base}/coverage_docs/scheduling_test.md (100%) rename test/e2e/{ => suites/base}/coverage_docs/seamless_migration_test.md (100%) rename test/e2e/{ => suites/base}/coverage_docs/search_test.md (100%) rename test/e2e/{ => suites/base}/coverage_docs/spread_by_region_test.md (100%) rename test/e2e/{ => suites/base}/coverage_docs/tainttoleration_test.md (100%) rename test/e2e/{ => suites/base}/cronfederatedhpa_test.go (99%) rename test/e2e/{ => suites/base}/dependenciesdistributor_test.go (99%) rename test/e2e/{ => suites/base}/deploymentreplicassyncer_test.go (99%) rename test/e2e/{ => suites/base}/failover_test.go (99%) rename test/e2e/{ => suites/base}/federatedhpa_test.go (99%) rename test/e2e/{ => suites/base}/federatedresourcequota_test.go (99%) rename test/e2e/{ => suites/base}/fieldselector_test.go (99%) rename test/e2e/{ => suites/base}/karmadactl_test.go (99%) rename test/e2e/{ => suites/base}/lazy_activation_policy_test.go (99%) rename test/e2e/{ => suites/base}/mcs_test.go (99%) rename test/e2e/{ => suites/base}/metrics_test.go (99%) rename test/e2e/{ => suites/base}/migration_and_rollback_test.go (99%) rename test/e2e/{ => suites/base}/namespace_test.go (99%) rename test/e2e/{ => suites/base}/overridepolicy_test.go (99%) rename test/e2e/{ => suites/base}/porting_workloads_test.go (99%) rename test/e2e/{ => suites/base}/preemption_test.go (99%) mode change 100755 => 100644 rename test/e2e/{ => suites/base}/propagationpolicy_test.go (99%) rename test/e2e/{ => suites/base}/remedy_test.go (99%) rename test/e2e/{ => suites/base}/rescheduling_test.go (99%) rename test/e2e/{ => suites/base}/resource_deletion_protection_test.go (99%) rename test/e2e/{ => suites/base}/resource_test.go (99%) rename test/e2e/{ => suites/base}/resourceinterpreter_test.go (99%) rename test/e2e/{ => suites/base}/scheduling_test.go (99%) rename test/e2e/{ => suites/base}/search_test.go (99%) rename test/e2e/{ => suites/base}/spread_by_region_test.go (99%) rename test/e2e/{ => suites/base}/suite.go (98%) rename test/e2e/{ => suites/base}/suite_log_test.go (99%) rename test/e2e/{ => suites/base}/suite_test.go (99%) rename test/e2e/{ => suites/base}/tainttoleration_test.go (99%) rename test/e2e/{ => suites/base}/workloadrebalancer_test.go (99%) diff --git a/.github/workflows/installation-cli.yaml b/.github/workflows/installation-cli.yaml index cd7d9be7e..26ad27814 100644 --- a/.github/workflows/installation-cli.yaml +++ b/.github/workflows/installation-cli.yaml @@ -46,7 +46,7 @@ jobs: # run a single e2e export KUBECONFIG=${HOME}/.kube/karmada-host.config:${HOME}/karmada/karmada-apiserver.config GO111MODULE=on go install github.com/onsi/ginkgo/v2/ginkgo - ginkgo -v --race --trace -p --focus="[BasicPropagation] propagation testing deployment propagation testing" ./test/e2e/ + ginkgo -v --race --trace -p --focus="[BasicPropagation] propagation testing deployment propagation testing" ./test/e2e/suites/base - name: export logs if: always() run: | @@ -89,7 +89,7 @@ jobs: # run a single e2e export KUBECONFIG=${HOME}/.kube/karmada-host.config:${HOME}/karmada/karmada-apiserver.config GO111MODULE=on go install github.com/onsi/ginkgo/v2/ginkgo - ginkgo -v --race --trace -p --focus="[BasicPropagation] propagation testing deployment propagation testing" ./test/e2e/ + ginkgo -v --race --trace -p --focus="[BasicPropagation] propagation testing deployment propagation testing" ./test/e2e/suites/base - name: export logs for config test if: always() run: | diff --git a/.github/workflows/installation-operator.yaml b/.github/workflows/installation-operator.yaml index 8b1127f82..d01df9dfb 100644 --- a/.github/workflows/installation-operator.yaml +++ b/.github/workflows/installation-operator.yaml @@ -59,7 +59,7 @@ jobs: export KUBECONFIG=${HOME}/.kube/karmada.config kubectl config use-context karmada-apiserver GO111MODULE=on go install github.com/onsi/ginkgo/v2/ginkgo - ginkgo -v --race --trace -p --focus="[BasicPropagation] propagation testing deployment propagation testing" ./test/e2e/ + ginkgo -v --race --trace -p --focus="[BasicPropagation] propagation testing deployment propagation testing" ./test/e2e/suites/base - name: export logs if: always() run: | diff --git a/hack/run-e2e.sh b/hack/run-e2e.sh index 7e3fb22db..e2f654417 100755 --- a/hack/run-e2e.sh +++ b/hack/run-e2e.sh @@ -53,7 +53,7 @@ export KUBECONFIG=${KARMADA_APISERVER_KUBECONFIG} export PULL_BASED_CLUSTERS=${PULL_BASED_CLUSTERS} set +e -ginkgo -v --race --trace --fail-fast -p --randomize-all ./test/e2e/ -- --karmada-context=karmada-apiserver +ginkgo -v --race --trace --fail-fast -p --randomize-all ./test/e2e/suites/base -- --karmada-context=karmada-apiserver TESTING_RESULT=$? # Collect logs diff --git a/test/e2e/aggregatedapi_test.go b/test/e2e/suites/base/aggregatedapi_test.go similarity index 99% rename from test/e2e/aggregatedapi_test.go rename to test/e2e/suites/base/aggregatedapi_test.go index 010810b10..07e1fae59 100644 --- a/test/e2e/aggregatedapi_test.go +++ b/test/e2e/suites/base/aggregatedapi_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package base import ( "fmt" diff --git a/test/e2e/clusteraffinities_test.go b/test/e2e/suites/base/clusteraffinities_test.go similarity index 99% rename from test/e2e/clusteraffinities_test.go rename to test/e2e/suites/base/clusteraffinities_test.go index 10d321d61..8929dae26 100644 --- a/test/e2e/clusteraffinities_test.go +++ b/test/e2e/suites/base/clusteraffinities_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package base import ( "context" diff --git a/test/e2e/clusteroverridepolicy_test.go b/test/e2e/suites/base/clusteroverridepolicy_test.go similarity index 99% rename from test/e2e/clusteroverridepolicy_test.go rename to test/e2e/suites/base/clusteroverridepolicy_test.go index db939e782..55d4db98b 100644 --- a/test/e2e/clusteroverridepolicy_test.go +++ b/test/e2e/suites/base/clusteroverridepolicy_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package base import ( "context" diff --git a/test/e2e/clusterpropagationpolicy_test.go b/test/e2e/suites/base/clusterpropagationpolicy_test.go similarity index 99% rename from test/e2e/clusterpropagationpolicy_test.go rename to test/e2e/suites/base/clusterpropagationpolicy_test.go index 3aa0266b9..eb8afd1bd 100644 --- a/test/e2e/clusterpropagationpolicy_test.go +++ b/test/e2e/suites/base/clusterpropagationpolicy_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package base import ( "context" diff --git a/test/e2e/clusterresourcebinding_test.go b/test/e2e/suites/base/clusterresourcebinding_test.go similarity index 99% rename from test/e2e/clusterresourcebinding_test.go rename to test/e2e/suites/base/clusterresourcebinding_test.go index 2937d45fe..695f103fb 100644 --- a/test/e2e/clusterresourcebinding_test.go +++ b/test/e2e/suites/base/clusterresourcebinding_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package base import ( "context" diff --git a/test/e2e/coverage_docs/E2E_coverage.md b/test/e2e/suites/base/coverage_docs/E2E_coverage.md similarity index 100% rename from test/e2e/coverage_docs/E2E_coverage.md rename to test/e2e/suites/base/coverage_docs/E2E_coverage.md diff --git a/test/e2e/coverage_docs/aggregatedapi_test.md b/test/e2e/suites/base/coverage_docs/aggregatedapi_test.md similarity index 100% rename from test/e2e/coverage_docs/aggregatedapi_test.md rename to test/e2e/suites/base/coverage_docs/aggregatedapi_test.md diff --git a/test/e2e/coverage_docs/clusteraffinities_test.md b/test/e2e/suites/base/coverage_docs/clusteraffinities_test.md similarity index 100% rename from test/e2e/coverage_docs/clusteraffinities_test.md rename to test/e2e/suites/base/coverage_docs/clusteraffinities_test.md diff --git a/test/e2e/coverage_docs/clusteroverridepolicy_test.md b/test/e2e/suites/base/coverage_docs/clusteroverridepolicy_test.md similarity index 100% rename from test/e2e/coverage_docs/clusteroverridepolicy_test.md rename to test/e2e/suites/base/coverage_docs/clusteroverridepolicy_test.md diff --git a/test/e2e/coverage_docs/clusterpropagationpolicy_test.md b/test/e2e/suites/base/coverage_docs/clusterpropagationpolicy_test.md similarity index 100% rename from test/e2e/coverage_docs/clusterpropagationpolicy_test.md rename to test/e2e/suites/base/coverage_docs/clusterpropagationpolicy_test.md diff --git a/test/e2e/coverage_docs/cronfederatedhpa_test.md b/test/e2e/suites/base/coverage_docs/cronfederatedhpa_test.md similarity index 100% rename from test/e2e/coverage_docs/cronfederatedhpa_test.md rename to test/e2e/suites/base/coverage_docs/cronfederatedhpa_test.md diff --git a/test/e2e/coverage_docs/dependenciesdistributor_test.md b/test/e2e/suites/base/coverage_docs/dependenciesdistributor_test.md similarity index 100% rename from test/e2e/coverage_docs/dependenciesdistributor_test.md rename to test/e2e/suites/base/coverage_docs/dependenciesdistributor_test.md diff --git a/test/e2e/coverage_docs/failover_test.md b/test/e2e/suites/base/coverage_docs/failover_test.md similarity index 100% rename from test/e2e/coverage_docs/failover_test.md rename to test/e2e/suites/base/coverage_docs/failover_test.md diff --git a/test/e2e/coverage_docs/federatedresourcequota_test.md b/test/e2e/suites/base/coverage_docs/federatedresourcequota_test.md similarity index 100% rename from test/e2e/coverage_docs/federatedresourcequota_test.md rename to test/e2e/suites/base/coverage_docs/federatedresourcequota_test.md diff --git a/test/e2e/coverage_docs/fieldselector_test.md b/test/e2e/suites/base/coverage_docs/fieldselector_test.md similarity index 100% rename from test/e2e/coverage_docs/fieldselector_test.md rename to test/e2e/suites/base/coverage_docs/fieldselector_test.md diff --git a/test/e2e/coverage_docs/hpareplicassyncer_test.md b/test/e2e/suites/base/coverage_docs/hpareplicassyncer_test.md similarity index 100% rename from test/e2e/coverage_docs/hpareplicassyncer_test.md rename to test/e2e/suites/base/coverage_docs/hpareplicassyncer_test.md diff --git a/test/e2e/coverage_docs/karmadactl_test.md b/test/e2e/suites/base/coverage_docs/karmadactl_test.md similarity index 100% rename from test/e2e/coverage_docs/karmadactl_test.md rename to test/e2e/suites/base/coverage_docs/karmadactl_test.md diff --git a/test/e2e/coverage_docs/mcs_test.md b/test/e2e/suites/base/coverage_docs/mcs_test.md similarity index 100% rename from test/e2e/coverage_docs/mcs_test.md rename to test/e2e/suites/base/coverage_docs/mcs_test.md diff --git a/test/e2e/coverage_docs/namespace_test.md b/test/e2e/suites/base/coverage_docs/namespace_test.md similarity index 100% rename from test/e2e/coverage_docs/namespace_test.md rename to test/e2e/suites/base/coverage_docs/namespace_test.md diff --git a/test/e2e/coverage_docs/overridepolicy_test.md b/test/e2e/suites/base/coverage_docs/overridepolicy_test.md similarity index 100% rename from test/e2e/coverage_docs/overridepolicy_test.md rename to test/e2e/suites/base/coverage_docs/overridepolicy_test.md diff --git a/test/e2e/coverage_docs/porting_workloads_test.md b/test/e2e/suites/base/coverage_docs/porting_workloads_test.md similarity index 100% rename from test/e2e/coverage_docs/porting_workloads_test.md rename to test/e2e/suites/base/coverage_docs/porting_workloads_test.md diff --git a/test/e2e/coverage_docs/propagationpolicy_test.md b/test/e2e/suites/base/coverage_docs/propagationpolicy_test.md similarity index 100% rename from test/e2e/coverage_docs/propagationpolicy_test.md rename to test/e2e/suites/base/coverage_docs/propagationpolicy_test.md diff --git a/test/e2e/coverage_docs/rescheduling_test.md b/test/e2e/suites/base/coverage_docs/rescheduling_test.md similarity index 100% rename from test/e2e/coverage_docs/rescheduling_test.md rename to test/e2e/suites/base/coverage_docs/rescheduling_test.md diff --git a/test/e2e/coverage_docs/resource_deletion_protection_test.md b/test/e2e/suites/base/coverage_docs/resource_deletion_protection_test.md similarity index 100% rename from test/e2e/coverage_docs/resource_deletion_protection_test.md rename to test/e2e/suites/base/coverage_docs/resource_deletion_protection_test.md diff --git a/test/e2e/coverage_docs/resource_test.md b/test/e2e/suites/base/coverage_docs/resource_test.md similarity index 100% rename from test/e2e/coverage_docs/resource_test.md rename to test/e2e/suites/base/coverage_docs/resource_test.md diff --git a/test/e2e/coverage_docs/resourceinterpreter_test.md b/test/e2e/suites/base/coverage_docs/resourceinterpreter_test.md similarity index 100% rename from test/e2e/coverage_docs/resourceinterpreter_test.md rename to test/e2e/suites/base/coverage_docs/resourceinterpreter_test.md diff --git a/test/e2e/coverage_docs/scheduling_test.md b/test/e2e/suites/base/coverage_docs/scheduling_test.md similarity index 100% rename from test/e2e/coverage_docs/scheduling_test.md rename to test/e2e/suites/base/coverage_docs/scheduling_test.md diff --git a/test/e2e/coverage_docs/seamless_migration_test.md b/test/e2e/suites/base/coverage_docs/seamless_migration_test.md similarity index 100% rename from test/e2e/coverage_docs/seamless_migration_test.md rename to test/e2e/suites/base/coverage_docs/seamless_migration_test.md diff --git a/test/e2e/coverage_docs/search_test.md b/test/e2e/suites/base/coverage_docs/search_test.md similarity index 100% rename from test/e2e/coverage_docs/search_test.md rename to test/e2e/suites/base/coverage_docs/search_test.md diff --git a/test/e2e/coverage_docs/spread_by_region_test.md b/test/e2e/suites/base/coverage_docs/spread_by_region_test.md similarity index 100% rename from test/e2e/coverage_docs/spread_by_region_test.md rename to test/e2e/suites/base/coverage_docs/spread_by_region_test.md diff --git a/test/e2e/coverage_docs/tainttoleration_test.md b/test/e2e/suites/base/coverage_docs/tainttoleration_test.md similarity index 100% rename from test/e2e/coverage_docs/tainttoleration_test.md rename to test/e2e/suites/base/coverage_docs/tainttoleration_test.md diff --git a/test/e2e/cronfederatedhpa_test.go b/test/e2e/suites/base/cronfederatedhpa_test.go similarity index 99% rename from test/e2e/cronfederatedhpa_test.go rename to test/e2e/suites/base/cronfederatedhpa_test.go index ecef1c8d4..a69b5f670 100644 --- a/test/e2e/cronfederatedhpa_test.go +++ b/test/e2e/suites/base/cronfederatedhpa_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package base import ( "time" diff --git a/test/e2e/dependenciesdistributor_test.go b/test/e2e/suites/base/dependenciesdistributor_test.go similarity index 99% rename from test/e2e/dependenciesdistributor_test.go rename to test/e2e/suites/base/dependenciesdistributor_test.go index 55ee5d62a..97a54a0bf 100644 --- a/test/e2e/dependenciesdistributor_test.go +++ b/test/e2e/suites/base/dependenciesdistributor_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package base import ( "github.com/onsi/ginkgo/v2" diff --git a/test/e2e/deploymentreplicassyncer_test.go b/test/e2e/suites/base/deploymentreplicassyncer_test.go similarity index 99% rename from test/e2e/deploymentreplicassyncer_test.go rename to test/e2e/suites/base/deploymentreplicassyncer_test.go index 785e9bc4b..38ebb8f20 100644 --- a/test/e2e/deploymentreplicassyncer_test.go +++ b/test/e2e/suites/base/deploymentreplicassyncer_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package base import ( "context" diff --git a/test/e2e/failover_test.go b/test/e2e/suites/base/failover_test.go similarity index 99% rename from test/e2e/failover_test.go rename to test/e2e/suites/base/failover_test.go index b8114a30a..31cae7b95 100644 --- a/test/e2e/failover_test.go +++ b/test/e2e/suites/base/failover_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package base import ( "context" diff --git a/test/e2e/federatedhpa_test.go b/test/e2e/suites/base/federatedhpa_test.go similarity index 99% rename from test/e2e/federatedhpa_test.go rename to test/e2e/suites/base/federatedhpa_test.go index 87de12088..850c374b9 100644 --- a/test/e2e/federatedhpa_test.go +++ b/test/e2e/suites/base/federatedhpa_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package base import ( "github.com/onsi/ginkgo/v2" diff --git a/test/e2e/federatedresourcequota_test.go b/test/e2e/suites/base/federatedresourcequota_test.go similarity index 99% rename from test/e2e/federatedresourcequota_test.go rename to test/e2e/suites/base/federatedresourcequota_test.go index 7199f0637..9287691de 100644 --- a/test/e2e/federatedresourcequota_test.go +++ b/test/e2e/suites/base/federatedresourcequota_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package base import ( "context" diff --git a/test/e2e/fieldselector_test.go b/test/e2e/suites/base/fieldselector_test.go similarity index 99% rename from test/e2e/fieldselector_test.go rename to test/e2e/suites/base/fieldselector_test.go index 7667a8a48..5a437828b 100644 --- a/test/e2e/fieldselector_test.go +++ b/test/e2e/suites/base/fieldselector_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package base import ( "context" diff --git a/test/e2e/karmadactl_test.go b/test/e2e/suites/base/karmadactl_test.go similarity index 99% rename from test/e2e/karmadactl_test.go rename to test/e2e/suites/base/karmadactl_test.go index 3b8b9f39e..9db5ef4cd 100644 --- a/test/e2e/karmadactl_test.go +++ b/test/e2e/suites/base/karmadactl_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package base import ( "context" diff --git a/test/e2e/lazy_activation_policy_test.go b/test/e2e/suites/base/lazy_activation_policy_test.go similarity index 99% rename from test/e2e/lazy_activation_policy_test.go rename to test/e2e/suites/base/lazy_activation_policy_test.go index 439ea5832..8a4f9684a 100644 --- a/test/e2e/lazy_activation_policy_test.go +++ b/test/e2e/suites/base/lazy_activation_policy_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package base import ( "fmt" diff --git a/test/e2e/mcs_test.go b/test/e2e/suites/base/mcs_test.go similarity index 99% rename from test/e2e/mcs_test.go rename to test/e2e/suites/base/mcs_test.go index 7372446f4..09caa52df 100644 --- a/test/e2e/mcs_test.go +++ b/test/e2e/suites/base/mcs_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package base import ( "context" diff --git a/test/e2e/metrics_test.go b/test/e2e/suites/base/metrics_test.go similarity index 99% rename from test/e2e/metrics_test.go rename to test/e2e/suites/base/metrics_test.go index d32259113..32cd7f921 100644 --- a/test/e2e/metrics_test.go +++ b/test/e2e/suites/base/metrics_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package base import ( "context" diff --git a/test/e2e/migration_and_rollback_test.go b/test/e2e/suites/base/migration_and_rollback_test.go similarity index 99% rename from test/e2e/migration_and_rollback_test.go rename to test/e2e/suites/base/migration_and_rollback_test.go index eaff50ea5..d1418795f 100644 --- a/test/e2e/migration_and_rollback_test.go +++ b/test/e2e/suites/base/migration_and_rollback_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package base import ( "context" diff --git a/test/e2e/namespace_test.go b/test/e2e/suites/base/namespace_test.go similarity index 99% rename from test/e2e/namespace_test.go rename to test/e2e/suites/base/namespace_test.go index dc8a2b06c..32c340bc7 100644 --- a/test/e2e/namespace_test.go +++ b/test/e2e/suites/base/namespace_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package base import ( "context" diff --git a/test/e2e/overridepolicy_test.go b/test/e2e/suites/base/overridepolicy_test.go similarity index 99% rename from test/e2e/overridepolicy_test.go rename to test/e2e/suites/base/overridepolicy_test.go index 663e4951d..1702bac1b 100644 --- a/test/e2e/overridepolicy_test.go +++ b/test/e2e/suites/base/overridepolicy_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package base import ( "fmt" diff --git a/test/e2e/porting_workloads_test.go b/test/e2e/suites/base/porting_workloads_test.go similarity index 99% rename from test/e2e/porting_workloads_test.go rename to test/e2e/suites/base/porting_workloads_test.go index 4786dd150..7af26face 100644 --- a/test/e2e/porting_workloads_test.go +++ b/test/e2e/suites/base/porting_workloads_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package base import ( "context" diff --git a/test/e2e/preemption_test.go b/test/e2e/suites/base/preemption_test.go old mode 100755 new mode 100644 similarity index 99% rename from test/e2e/preemption_test.go rename to test/e2e/suites/base/preemption_test.go index 93c193fc0..bcb2b5c93 --- a/test/e2e/preemption_test.go +++ b/test/e2e/suites/base/preemption_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package base import ( "github.com/onsi/ginkgo/v2" diff --git a/test/e2e/propagationpolicy_test.go b/test/e2e/suites/base/propagationpolicy_test.go similarity index 99% rename from test/e2e/propagationpolicy_test.go rename to test/e2e/suites/base/propagationpolicy_test.go index 3440d8949..cb5b57e7f 100644 --- a/test/e2e/propagationpolicy_test.go +++ b/test/e2e/suites/base/propagationpolicy_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package base import ( "context" diff --git a/test/e2e/remedy_test.go b/test/e2e/suites/base/remedy_test.go similarity index 99% rename from test/e2e/remedy_test.go rename to test/e2e/suites/base/remedy_test.go index 00c321e56..afd3053ba 100644 --- a/test/e2e/remedy_test.go +++ b/test/e2e/suites/base/remedy_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package base import ( "fmt" diff --git a/test/e2e/rescheduling_test.go b/test/e2e/suites/base/rescheduling_test.go similarity index 99% rename from test/e2e/rescheduling_test.go rename to test/e2e/suites/base/rescheduling_test.go index 82b9e4656..a74ca0b24 100644 --- a/test/e2e/rescheduling_test.go +++ b/test/e2e/suites/base/rescheduling_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package base import ( "fmt" diff --git a/test/e2e/resource_deletion_protection_test.go b/test/e2e/suites/base/resource_deletion_protection_test.go similarity index 99% rename from test/e2e/resource_deletion_protection_test.go rename to test/e2e/suites/base/resource_deletion_protection_test.go index 3f9a3d448..8e1104252 100644 --- a/test/e2e/resource_deletion_protection_test.go +++ b/test/e2e/suites/base/resource_deletion_protection_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package base import ( "context" diff --git a/test/e2e/resource_test.go b/test/e2e/suites/base/resource_test.go similarity index 99% rename from test/e2e/resource_test.go rename to test/e2e/suites/base/resource_test.go index 971d24341..b62e8676f 100644 --- a/test/e2e/resource_test.go +++ b/test/e2e/suites/base/resource_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package base import ( "context" diff --git a/test/e2e/resourceinterpreter_test.go b/test/e2e/suites/base/resourceinterpreter_test.go similarity index 99% rename from test/e2e/resourceinterpreter_test.go rename to test/e2e/suites/base/resourceinterpreter_test.go index f477ee204..e0c4dd536 100644 --- a/test/e2e/resourceinterpreter_test.go +++ b/test/e2e/suites/base/resourceinterpreter_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package base import ( "context" diff --git a/test/e2e/scheduling_test.go b/test/e2e/suites/base/scheduling_test.go similarity index 99% rename from test/e2e/scheduling_test.go rename to test/e2e/suites/base/scheduling_test.go index 8eb7c40f0..8f5499484 100644 --- a/test/e2e/scheduling_test.go +++ b/test/e2e/suites/base/scheduling_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package base import ( "context" diff --git a/test/e2e/search_test.go b/test/e2e/suites/base/search_test.go similarity index 99% rename from test/e2e/search_test.go rename to test/e2e/suites/base/search_test.go index 68d8f6d7c..81aac8cf0 100644 --- a/test/e2e/search_test.go +++ b/test/e2e/suites/base/search_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package base import ( "context" diff --git a/test/e2e/spread_by_region_test.go b/test/e2e/suites/base/spread_by_region_test.go similarity index 99% rename from test/e2e/spread_by_region_test.go rename to test/e2e/suites/base/spread_by_region_test.go index 6e74a29d6..bddf328cc 100644 --- a/test/e2e/spread_by_region_test.go +++ b/test/e2e/suites/base/spread_by_region_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package base import ( "context" diff --git a/test/e2e/suite.go b/test/e2e/suites/base/suite.go similarity index 98% rename from test/e2e/suite.go rename to test/e2e/suites/base/suite.go index ef23cbe62..a96dcfdcc 100644 --- a/test/e2e/suite.go +++ b/test/e2e/suites/base/suite.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package base const ( // NeedCreateCluster define the spec label that need to create a cluster. diff --git a/test/e2e/suite_log_test.go b/test/e2e/suites/base/suite_log_test.go similarity index 99% rename from test/e2e/suite_log_test.go rename to test/e2e/suites/base/suite_log_test.go index 364a76f35..be43ffc40 100644 --- a/test/e2e/suite_log_test.go +++ b/test/e2e/suites/base/suite_log_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package base import ( "context" diff --git a/test/e2e/suite_test.go b/test/e2e/suites/base/suite_test.go similarity index 99% rename from test/e2e/suite_test.go rename to test/e2e/suites/base/suite_test.go index a5f8e0677..d772ecfab 100644 --- a/test/e2e/suite_test.go +++ b/test/e2e/suites/base/suite_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package base import ( "context" @@ -124,7 +124,7 @@ var ( func init() { // usage ginkgo -- --poll-interval=5s --poll-timeout=5m - // eg. ginkgo -v --race --trace --fail-fast -p --randomize-all ./test/e2e/ -- --poll-interval=5s --poll-timeout=5m + // eg. ginkgo -v --race --trace --fail-fast -p --randomize-all ./test/e2e/suites/base -- --poll-interval=5s --poll-timeout=5m flag.DurationVar(&pollInterval, "poll-interval", 5*time.Second, "poll-interval defines the interval time for a poll operation") flag.DurationVar(&pollTimeout, "poll-timeout", 300*time.Second, "poll-timeout defines the time which the poll operation times out") flag.StringVar(&hostContext, "host-context", "karmada-host", "Name of the host cluster context in control plane kubeconfig file.") diff --git a/test/e2e/tainttoleration_test.go b/test/e2e/suites/base/tainttoleration_test.go similarity index 99% rename from test/e2e/tainttoleration_test.go rename to test/e2e/suites/base/tainttoleration_test.go index 0190ada2b..a31ba2735 100644 --- a/test/e2e/tainttoleration_test.go +++ b/test/e2e/suites/base/tainttoleration_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package base import ( "context" diff --git a/test/e2e/workloadrebalancer_test.go b/test/e2e/suites/base/workloadrebalancer_test.go similarity index 99% rename from test/e2e/workloadrebalancer_test.go rename to test/e2e/suites/base/workloadrebalancer_test.go index 97fa94b9f..44e4bbeee 100644 --- a/test/e2e/workloadrebalancer_test.go +++ b/test/e2e/suites/base/workloadrebalancer_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package base import ( "sort"