test joinleave

Signed-off-by: Wantong Jiang <[email protected]>

Author: jwtty

.github/workflows/ci.yml

@@ -89,13 +89,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        customized-settings: [default, serial, custom]
+        customized-settings: [default, joinleave, custom]
         include:
           - customized-settings: default
             # to shorten the test duration, set the resource snapshot creation interval to 0
             resource-snapshot-creation-minimum-interval: 0m
             resource-changes-collection-duration: 0m
-          - customized-settings: serial
+          - customized-settings: joinleave
             # to shorten the test duration, set the resource snapshot creation interval to 0
             resource-snapshot-creation-minimum-interval: 0m
             resource-changes-collection-duration: 0m
@@ -136,9 +136,9 @@ jobs:
       - name: Run e2e tests
         run: |
           if [ "${{ matrix.customized-settings }}" = "default" ]; then
-            make e2e-tests-parallel
-          elif [ "${{ matrix.customized-settings }}" = "serial" ]; then
-            make e2e-tests-serial
+            make e2e-tests LABEL_FILTER="!custom && !joinleave"
+          elif [ "${{ matrix.customized-settings }}" = "joinleave" ]; then
+            make e2e-tests LABEL_FILTER="!custom && joinleave"
           else
             make e2e-tests-custom
           fi

CLAUDE.md

@@ -64,15 +64,6 @@ make setup-clusters MEMBER_CLUSTER_COUNT=5
 # Run parallel E2E tests (default - excludes custom tests)
 make e2e-tests
 
-# Run tests that can run in parallel
-make e2e-tests-parallel
-
-# Run serial tests (tests that must run sequentially)
-make e2e-tests-serial
-
-# Run custom configuration tests
-make e2e-tests-custom
-
 # Clean up test clusters
 make clean-e2e-tests
 ```

Makefile

@@ -211,17 +211,12 @@ install-helm:  load-hub-docker-image load-member-docker-image install-member-age
 .PHONY: e2e-tests-v1alpha1
 e2e-tests-v1alpha1: create-kind-cluster run-e2e-v1alpha1
 
+# E2E test label filter (can be overridden)
+LABEL_FILTER ?= !custom
+
 .PHONY: e2e-tests
 e2e-tests: setup-clusters
-	cd ./test/e2e && ginkgo --timeout=70m --label-filter="!custom" -v -p .
-
-# Tests that can be run in parallel
-e2e-tests-parallel: setup-clusters
-	cd ./test/e2e && ginkgo --label-filter="!custom && !mc-op" -v -p .
-
-# Tests that must be run serially
-e2e-tests-serial: setup-clusters
-	cd ./test/e2e && ginkgo --label-filter="!custom && mc-op" -v .
+	cd ./test/e2e && ginkgo --timeout=70m --label-filter="$(LABEL_FILTER)" -v -p .
 
 e2e-tests-custom: setup-clusters
 	cd ./test/e2e && ginkgo --label-filter="custom" -v -p . 

test/e2e/fleet_guard_rail_test.go

@@ -82,7 +82,7 @@ var _ = Describe("fleet guard rail tests for deny fleet MC CREATE operations", f
 	})
 })
 
-var _ = Describe("fleet guard rail tests for allow/deny fleet MC UPDATE, DELETE operations", Label("mc-op"), Serial, Ordered, func() {
+var _ = Describe("fleet guard rail tests for allow/deny fleet MC UPDATE, DELETE operations", Serial, Ordered, func() {
 	mcName := fmt.Sprintf(mcNameTemplate, GinkgoParallelProcess())
 
 	BeforeAll(func() {
@@ -346,7 +346,7 @@ var _ = Describe("fleet guard rail tests for allow upstream MC CREATE, DELETE op
 	})
 })
 
-var _ = Describe("fleet guard rail tests for allow/deny upstream MC UPDATE operations", Label("mc-op"), Serial, Ordered, func() {
+var _ = Describe("fleet guard rail tests for allow/deny upstream MC UPDATE operations", Serial, Ordered, func() {
 	mcName := fmt.Sprintf(mcNameTemplate, GinkgoParallelProcess())
 
 	BeforeAll(func() {
@@ -499,7 +499,7 @@ var _ = Describe("fleet guard rail tests for allow/deny upstream MC UPDATE opera
 	})
 })
 
-var _ = Describe("fleet guard rail tests for IMC UPDATE operation, in fleet-member prefixed namespace with user not in MC identity", Label("mc-op"), Serial, Ordered, func() {
+var _ = Describe("fleet guard rail tests for IMC UPDATE operation, in fleet-member prefixed namespace with user not in MC identity", Serial, Ordered, func() {
 	mcName := fmt.Sprintf(mcNameTemplate, GinkgoParallelProcess())
 	imcNamespace := fmt.Sprintf(utils.NamespaceNameFormat, mcName)
 
@@ -578,7 +578,7 @@ var _ = Describe("fleet guard rail tests for IMC UPDATE operation, in fleet-memb
 	})
 })
 
-var _ = Describe("fleet guard rail tests for IMC UPDATE operation, in fleet-member prefixed namespace with user in MC identity", Label("mc-op"), Serial, Ordered, func() {
+var _ = Describe("fleet guard rail tests for IMC UPDATE operation, in fleet-member prefixed namespace with user in MC identity", Serial, Ordered, func() {
 	mcName := fmt.Sprintf(mcNameTemplate, GinkgoParallelProcess())
 	imcNamespace := fmt.Sprintf(utils.NamespaceNameFormat, mcName)
 
@@ -640,7 +640,7 @@ var _ = Describe("fleet guard rail tests for IMC UPDATE operation, in fleet-memb
 	})
 })
 
-var _ = Describe("fleet guard rail for UPDATE work operations, in fleet prefixed namespace with user not in MC identity", Label("mc-op"), Serial, Ordered, func() {
+var _ = Describe("fleet guard rail for UPDATE work operations, in fleet prefixed namespace with user not in MC identity", Serial, Ordered, func() {
 	mcName := fmt.Sprintf(mcNameTemplate, GinkgoParallelProcess())
 	imcNamespace := fmt.Sprintf(utils.NamespaceNameFormat, mcName)
 	workName := fmt.Sprintf(workNamespaceNameTemplate, GinkgoParallelProcess())
@@ -731,7 +731,7 @@ var _ = Describe("fleet guard rail for UPDATE work operations, in fleet prefixed
 	})
 })
 
-var _ = Describe("fleet guard rail for UPDATE work operations, in fleet prefixed namespace with user in MC identity", Label("mc-op"), Serial, Ordered, func() {
+var _ = Describe("fleet guard rail for UPDATE work operations, in fleet prefixed namespace with user in MC identity", Serial, Ordered, func() {
 	mcName := fmt.Sprintf(mcNameTemplate, GinkgoParallelProcess())
 	imcNamespace := fmt.Sprintf(utils.NamespaceNameFormat, mcName)
 	workName := fmt.Sprintf(workNamespaceNameTemplate, GinkgoParallelProcess())
@@ -796,7 +796,7 @@ var _ = Describe("fleet guard rail for UPDATE work operations, in fleet prefixed
 	})
 })
 
-var _ = Describe("fleet guard rail networking E2Es", Label("mc-op"), Serial, Ordered, func() {
+var _ = Describe("fleet guard rail networking E2Es", Serial, Ordered, func() {
 	Context("deny request to modify fleet networking resources in fleet member namespaces, for user not in member cluster identity", func() {
 		mcName := fmt.Sprintf(mcNameTemplate, GinkgoParallelProcess())
 		iseName := fmt.Sprintf(internalServiceExportNameTemplate, GinkgoParallelProcess())
@@ -916,7 +916,7 @@ var _ = Describe("fleet guard rail networking E2Es", Label("mc-op"), Serial, Ord
 	})
 })
 
-var _ = Describe("fleet guard rail restrict internal fleet resources from being created in fleet/kube pre-fixed namespaces", Label("mc-op"), Serial, Ordered, func() {
+var _ = Describe("fleet guard rail restrict internal fleet resources from being created in fleet/kube pre-fixed namespaces", Serial, Ordered, func() {
 	Context("deny request to CREATE IMC in fleet-system namespace", func() {
 		It("should deny CREATE operation on internal member cluster resource in fleet-system namespace for invalid user", func() {
 			imc := clusterv1beta1.InternalMemberCluster{

test/e2e/join_and_leave_test.go

@@ -43,7 +43,7 @@ const (
 )
 
 // Note that this container cannot run in parallel with other containers.
-var _ = Describe("Test member cluster join and leave flow", Label("mc-op"), Ordered, Serial, func() {
+var _ = Describe("Test member cluster join and leave flow", Label("joinleave"), Ordered, Serial, func() {
 	crpName := fmt.Sprintf(crpNameTemplate, GinkgoParallelProcess())
 	workNamespaceName := fmt.Sprintf(workNamespaceNameTemplate, GinkgoParallelProcess())
 	internalServiceExportName := fmt.Sprintf("internal-service-export-%d", GinkgoParallelProcess())
@@ -79,7 +79,7 @@ var _ = Describe("Test member cluster join and leave flow", Label("mc-op"), Orde
 		}
 	})
 
-	Context("Test cluster join and leave flow with CRP not deleted", Label("mc-op"), Ordered, Serial, func() {
+	Context("Test cluster join and leave flow with CRP not deleted", Label("joinleave"), Ordered, Serial, func() {
 		It("Create the test resources in the namespace", createWrappedResourcesForEnvelopTest)
 
 		It("Create the CRP that select the name space and place it to all clusters", func() {
@@ -245,8 +245,8 @@ var _ = Describe("Test member cluster join and leave flow", Label("mc-op"), Orde
 	})
 })
 
-var _ = Describe("Test member cluster force delete flow", Label("mc-op"), Ordered, Serial, func() {
-	Context("Test cluster join and leave flow with member agent down and force delete member cluster", Label("mc-op"), Ordered, Serial, func() {
+var _ = Describe("Test member cluster force delete flow", Label("joinleave"), Ordered, Serial, func() {
+	Context("Test cluster join and leave flow with member agent down and force delete member cluster", Label("joinleave"), Ordered, Serial, func() {
 		It("Simulate the member agent going down in member cluster", func() {
 			updateMemberAgentDeploymentReplicas(memberCluster3WestProdClient, 0)
 		})

test/e2e/scheduler_watchers_test.go

@@ -61,7 +61,7 @@ const (
 // Note that most of the cases below are Serial ones, as they manipulate the list of member
 // clusters in the test environment directly, which may incur side effects when running in
 // parallel with other test cases.
-var _ = Describe("responding to specific member cluster changes", Label("mc-op"), func() {
+var _ = Describe("responding to specific member cluster changes", Label("joinleave"), func() {
 	Context("cluster becomes eligible for PickAll CRPs, just joined", Serial, Ordered, func() {
 		crpName := fmt.Sprintf(crpNameTemplate, GinkgoParallelProcess())
 

test/e2e/updaterun_test.go

@@ -907,7 +907,7 @@ var _ = Describe("test CRP rollout with staged update run", func() {
 })
 
 // Note that this container cannot run in parallel with other containers.
-var _ = Describe("Test member cluster join and leave flow with updateRun", Label("mc-op"), Ordered, Serial, func() {
+var _ = Describe("Test member cluster join and leave flow with updateRun", Label("joinleave"), Ordered, Serial, func() {
 	crpName := fmt.Sprintf(crpNameTemplate, GinkgoParallelProcess())
 	strategyName := fmt.Sprintf(updateRunStrategyNameTemplate, GinkgoParallelProcess())
 	var strategy *placementv1beta1.ClusterStagedUpdateStrategy
@@ -1008,7 +1008,7 @@ var _ = Describe("Test member cluster join and leave flow with updateRun", Label
 		ensureUpdateRunStrategyDeletion(strategyName)
 	})
 
-	Context("UpdateRun should delete the binding of a left cluster but resources are kept", Label("mc-op"), Ordered, Serial, func() {
+	Context("UpdateRun should delete the binding of a left cluster but resources are kept", Label("joinleave"), Ordered, Serial, func() {
 		It("Should validate binding for member cluster 1 is set to Unscheduled", func() {
 			bindingUnscheduledActual := bindingStateActual(crpName, allMemberClusterNames[0], placementv1beta1.BindingStateUnscheduled)
 			Eventually(bindingUnscheduledActual, eventuallyDuration, eventuallyInterval).Should(Succeed(), "Failed to mark binding for member cluster %s as unscheduled", allMemberClusterNames[0])
@@ -1056,7 +1056,7 @@ var _ = Describe("Test member cluster join and leave flow with updateRun", Label
 		})
 	})
 
-	Context("Rejoin a member cluster when resources are not changed", Label("mc-op"), Ordered, Serial, func() {
+	Context("Rejoin a member cluster when resources are not changed", Label("joinleave"), Ordered, Serial, func() {
 		It("Should be able to rejoin member cluster 1", func() {
 			setMemberClusterToJoin(allMemberClusters[0])
 			checkIfMemberClusterHasJoined(allMemberClusters[0])
@@ -1084,7 +1084,7 @@ var _ = Describe("Test member cluster join and leave flow with updateRun", Label
 		})
 	})
 
-	Context("Rejoin a member cluster when resources are changed", Label("mc-op"), Ordered, Serial, func() {
+	Context("Rejoin a member cluster when resources are changed", Label("joinleave"), Ordered, Serial, func() {
 		var newConfigMap corev1.ConfigMap
 
 		It("Generate a new configMap", func() {
@@ -1134,7 +1134,7 @@ var _ = Describe("Test member cluster join and leave flow with updateRun", Label
 		})
 	})
 
-	Context("Rejoin a member cluster after orphaned resources are deleted on the member cluster", Label("mc-op"), Ordered, Serial, func() {
+	Context("Rejoin a member cluster after orphaned resources are deleted on the member cluster", Label("joinleave"), Ordered, Serial, func() {
 		It("Should delete the orphaned resources on member cluster 1", func() {
 			cleanWorkResourcesOnCluster(allMemberClusters[0])
 		})
@@ -1166,7 +1166,7 @@ var _ = Describe("Test member cluster join and leave flow with updateRun", Label
 		})
 	})
 
-	Context("Rejoin a member cluster and change to rollout CRP with rollingUpdate", Label("mc-op"), Ordered, Serial, func() {
+	Context("Rejoin a member cluster and change to rollout CRP with rollingUpdate", Label("joinleave"), Ordered, Serial, func() {
 		It("Should be able to rejoin member cluster 1", func() {
 			setMemberClusterToJoin(allMemberClusters[0])
 			checkIfMemberClusterHasJoined(allMemberClusters[0])