Update e2e test cases for changes

Author: johscheuer

e2e/Makefile

@@ -156,7 +156,7 @@ foundationdb-pr-tests: GINKGO_LABEL_FILTER=--ginkgo.label-filter="foundationdb-p
 # Run the actual foundationdb-pr tests.
 foundationdb-pr-tests: run
 
-# Only run tests that are labeled with the "foundationdb-nightly" or "foundationdb-pr"  label, this is used for the cluster tests in the
+# Only run tests that are labeled with the "foundationdb-nightly" or "foundationdb-pr" label, this is used for the cluster tests in the
 # foundationdb repo.
 foundationdb-nightly-tests: GINKGO_LABEL_FILTER=--ginkgo.label-filter="foundationdb-pr || foundationdb-nightly"
 

e2e/test_operator_migrations/operator_migration_test.go

@@ -188,7 +188,7 @@ var _ = Describe("Operator Migrations", Label("e2e", "pr"), func() {
 		})
 
 		It("should change the public IP source and create/delete services", func() {
-			Eventually(func() bool {
+			Eventually(func(g Gomega) {
 				pods := fdbCluster.GetPods()
 				svcList := fdbCluster.GetServices()
 
@@ -204,33 +204,30 @@ var _ = Describe("Operator Migrations", Label("e2e", "pr"), func() {
 						continue
 					}
 
-					if _, ok := svcMap[pod.Name]; !ok {
-						return false
-					}
-
+					g.Expect(svcMap).To(HaveKey(pod.Name))
 					delete(svcMap, pod.Name)
 				}
 
 				// We only expect one service here at the end since we run the cluster with a headless service.
 				if fdbCluster.HasHeadlessService() {
-					return len(svcMap) == 1
+					g.Expect(svcMap).To(HaveLen(1))
+					return
 				}
-				return len(svcMap) == 0
-			}).Should(BeTrue())
+
+				g.Expect(svcMap).To(BeEmpty())
+			}).Should(Succeed())
 		})
 
 		AfterEach(func() {
 			log.Printf("set public IP source to %s", fdbv1beta2.PublicIPSourcePod)
 			Expect(
 				fdbCluster.SetPublicIPSource(fdbv1beta2.PublicIPSourcePod),
 			).ShouldNot(HaveOccurred())
-			svcList := fdbCluster.GetServices()
-
 			var expectedSvcCnt int
 			if fdbCluster.HasHeadlessService() {
 				expectedSvcCnt = 1
 			}
-			Expect(svcList.Items).To(HaveLen(expectedSvcCnt))
+			Expect(fdbCluster.GetServices().Items).To(HaveLen(expectedSvcCnt))
 		})
 	})
 

e2e/test_operator_upgrades_variations/operator_upgrades_variations_test.go

@@ -86,6 +86,9 @@ func performUpgrade(config testConfig, preUpgradeFunction func(cluster *fixtures
 	startTime := time.Now()
 	loggingTime := time.Now()
 	preUpgradeFunction(fdbCluster)
+	// Block the restart of the fdbserver processes. If we don't block the restart, it will be hard to observe the condition
+	// changes.
+	fdbCluster.SetKillProcesses(false, false)
 	Expect(fdbCluster.UpgradeCluster(config.targetVersion, false)).NotTo(HaveOccurred())
 
 	if !fixtures.VersionsAreProtocolCompatible(config.beforeVersion, config.targetVersion) {
@@ -104,6 +107,7 @@ func performUpgrade(config testConfig, preUpgradeFunction func(cluster *fixtures
 			}
 
 			for _, processGroup := range fdbCluster.GetCluster().Status.ProcessGroups {
+				// Ensure that at least one process group has the expected conditions.
 				if processGroup.MatchesConditions(expectedConditions) {
 					return true
 				}
@@ -113,6 +117,9 @@ func performUpgrade(config testConfig, preUpgradeFunction func(cluster *fixtures
 		}).WithTimeout(10 * time.Minute).WithPolling(5 * time.Second).Should(BeTrue())
 	}
 
+	// Allow the restart of the fdbserver processes again, now the upgrade should be proceeding
+	fdbCluster.SetKillProcesses(true, false)
+
 	loggingTime = time.Now()
 	transactionSystemProcessGroups := make(map[fdbv1beta2.ProcessGroupID]fdbv1beta2.None)
 	// Wait until the cluster is upgraded and fully reconciled.