test(e2e): skip test suite if operator was restarted or renamed

This is in preparation for the open source release of Cloud Native
PostgreSQL.

Co-authored-by: Jaime Silvela <jaime.silvela@enterprisedb.com>
Co-authored-by: Armando Ruocco <armando.ruocco@enterprisedb.com>

Author: 3 people

tests/e2e/asserts_test.go

@@ -305,21 +305,6 @@ func AssertConnection(host string, user string, dbname string,
 	})
 }
 
-// AssertOperatorPodUnchanged verifies that the pod has an expected name and never restarted
-func AssertOperatorPodUnchanged(expectedOperatorPodName string) {
-	operatorPod, err := env.GetOperatorPod()
-	Expect(err).NotTo(HaveOccurred())
-	Expect(operatorPod.GetName()).Should(BeEquivalentTo(expectedOperatorPodName),
-		"Operator pod was recreated before the end of the test")
-	restartCount := -1
-	for _, containerStatus := range operatorPod.Status.ContainerStatuses {
-		if containerStatus.Name == "manager" {
-			restartCount = int(containerStatus.RestartCount)
-		}
-	}
-	Expect(restartCount).Should(BeEquivalentTo(0), fmt.Sprintf("Operator pod get restarted %v times ", restartCount))
-}
-
 // AssertOperatorIsReady verifies that the operator is ready
 func AssertOperatorIsReady() {
 	Eventually(func() (bool, error) {

tests/e2e/suite_test.go

@@ -35,6 +35,8 @@ var (
 	env                     *utils.TestingEnvironment
 	testLevelEnv            *tests.TestEnvLevel
 	expectedOperatorPodName string
+	operatorPodWasRenamed   bool
+	operatorWasRestarted    bool
 )
 
 var _ = BeforeSuite(func() {
@@ -55,11 +57,22 @@ var _ = BeforeEach(func() {
 	labelsForTestsBreakingTheOperator := []string{"upgrade", "disruptive"}
 	breakingLabelsInCurrentTest := funk.Join(CurrentSpecReport().Labels(),
 		labelsForTestsBreakingTheOperator, funk.InnerJoin)
-	if len(breakingLabelsInCurrentTest.([]string)) == 0 {
-		operatorPod, err := env.GetOperatorPod()
-		Expect(err).NotTo(HaveOccurred())
-		expectedOperatorPodName = operatorPod.GetName()
+
+	if len(breakingLabelsInCurrentTest.([]string)) != 0 {
+		return
+	}
+
+	operatorPod, err := env.GetOperatorPod()
+	Expect(err).ToNot(HaveOccurred())
+
+	if operatorPodWasRenamed {
+		Skip("Skipping test. Operator was renamed")
+	}
+	if operatorWasRestarted {
+		Skip("Skipping test. Operator was restarted")
 	}
+
+	expectedOperatorPodName = operatorPod.GetName()
 })
 
 func TestE2ESuite(t *testing.T) {
@@ -70,11 +83,26 @@ func TestE2ESuite(t *testing.T) {
 
 // Before the end of the tests we should verify that the operator never restarted
 // and that the operator pod name didn't change.
+// If either of those things happened, the test will fail, and all subsequent
+// tests will be SKIPPED, as they would always fail in this node.
 var _ = AfterEach(func() {
 	labelsForTestsBreakingTheOperator := []string{"upgrade", "disruptive"}
 	breakingLabelsInCurrentTest := funk.Join(CurrentSpecReport().Labels(),
 		labelsForTestsBreakingTheOperator, funk.InnerJoin)
-	if len(breakingLabelsInCurrentTest.([]string)) == 0 {
-		AssertOperatorPodUnchanged(expectedOperatorPodName)
+	if len(breakingLabelsInCurrentTest.([]string)) != 0 {
+		return
+	}
+	operatorPod, err := env.GetOperatorPod()
+	Expect(err).ToNot(HaveOccurred())
+
+	wasRenamed := utils.OperatorPodRenamed(operatorPod, expectedOperatorPodName)
+	if wasRenamed {
+		operatorPodWasRenamed = true
+		Fail("operator was renamed")
+	}
+	wasRestarted := utils.OperatorPodRestarted(operatorPod)
+	if wasRestarted {
+		operatorWasRestarted = true
+		Fail("operator was restarted")
 	}
 })

tests/utils/operator.go

@@ -235,3 +235,19 @@ func (env TestingEnvironment) IsOperatorReady() (bool, error) {
 
 	return true, err
 }
+
+// OperatorPodRenamed checks if the operator pod was renamed
+func OperatorPodRenamed(operatorPod corev1.Pod, expectedOperatorPodName string) bool {
+	return operatorPod.GetName() != expectedOperatorPodName
+}
+
+// OperatorPodRestarted checks if the operator pod was restarted
+func OperatorPodRestarted(operatorPod corev1.Pod) bool {
+	restartCount := 0
+	for _, containerStatus := range operatorPod.Status.ContainerStatuses {
+		if containerStatus.Name == "manager" {
+			restartCount = int(containerStatus.RestartCount)
+		}
+	}
+	return restartCount != 0
+}