Revert "Merge pull request #1162 from Xia-Zhao-rh/migrate-2"

This reverts commit c2c64b7, reversing
changes made to b14da27.

Author: neisw

tests-extension/.openshift-tests-extension/openshift_payload_olmv0.json

@@ -351,21 +351,6 @@
       "exclude": "topology==\"External\""
     }
   },
-  {
-    "name": "[sig-operator][Jira:OLM] OLMv0 should PolarionID:43975-[OTP]olm operator serviceaccount should not rely on external networking for health check[Serial][Disruptive][Slow]",
-    "labels": {
-      "Extended": {},
-      "NonHyperShiftHOST": {}
-    },
-    "resources": {
-      "isolation": {}
-    },
-    "source": "openshift:payload:olmv0",
-    "lifecycle": "blocking",
-    "environmentSelector": {
-      "exclude": "topology==\"External\""
-    }
-  },
   {
     "name": "[sig-operator][Jira:OLM] OLMv0 optional should PolarionID:68679-[OTP][Skipped:Disconnected]catalogsource with invalid name is created",
     "originalName": "[sig-operator][Jira:OLM] OLMv0 optional should PolarionID:68679-[Skipped:Disconnected]catalogsource with invalid name is created",

tests-extension/test/qe/specs/olmv0_common.go

@@ -5,8 +5,6 @@ import (
 	"fmt"
 	"os/exec"
 	"path/filepath"
-	"regexp"
-	"strconv"
 	"strings"
 	"time"
 
@@ -1047,101 +1045,4 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 should", func() {
 		e2e.Logf("PrometheusRule validation passed: Alert rule is properly configured to monitor catalogsource_ready metric")
 	})
 
-	g.It("PolarionID:43975-[OTP]olm operator serviceaccount should not rely on external networking for health check[Disruptive][Slow]", g.Label("NonHyperShiftHOST"), func() {
-		g.By("1) get the cluster infrastructure")
-		infra, err := oc.AsAdmin().WithoutNamespace().Run("get").Args("infrastructures", "cluster", "-o=jsonpath={.status.infrastructureTopology}").Output()
-		if err != nil {
-			e2e.Failf("Fail to get the cluster infra")
-		}
-		if infra != "SingleReplica" {
-			g.Skip("Not SNO cluster - skipping test ...")
-		}
-
-		originProfile := olmv0util.GetResource(oc, exutil.AsAdmin, exutil.WithoutNamespace, "apiserver", "cluster", "-o=jsonpath={.spec.audit.profile}")
-		o.Expect(originProfile).NotTo(o.BeEmpty())
-		if strings.Compare(originProfile, "Default") != 0 {
-			g.Skip("audit profile is not Default - skipping test ...")
-		}
-
-		g.By("2) get revision number")
-		revisionNumber1 := 0
-		reg := regexp.MustCompile(`at revision (\d+)`)
-		if reg == nil {
-			e2e.Failf("get revision number regexp err!")
-		}
-		output, err := oc.AsAdmin().WithoutNamespace().Run("get").Args("kubeapiserver", "-o=jsonpath={..status.conditions[?(@.type==\"NodeInstallerProgressing\")]}").Output()
-		if err != nil {
-			e2e.Failf("Fail to get kubeapiserver")
-		}
-		result := reg.FindAllStringSubmatch(output, -1)
-		if result != nil {
-			revisionNumberStr1 := result[0][1]
-			revisionNumber1, _ = strconv.Atoi(revisionNumberStr1)
-			e2e.Logf("origin revision number is : %v", revisionNumber1)
-		} else {
-			e2e.Failf("Fail to get revision number")
-		}
-
-		g.By("3) Configuring the audit log policy to AllRequestBodies")
-		defer func() {
-			pathJSON := fmt.Sprintf("{\"spec\":{\"audit\":{\"profile\":\"%s\"}}}", originProfile)
-			e2e.Logf("recover to be %v", pathJSON)
-			exutil.PatchResource(oc, exutil.AsAdmin, exutil.WithoutNamespace, "apiserver", "cluster", "-p", pathJSON, "--type=merge")
-			output = olmv0util.GetResource(oc, exutil.AsAdmin, exutil.WithoutNamespace, "apiserver", "cluster", "-o=jsonpath={.spec.audit.profile}")
-			o.Expect(output).To(o.Equal("Default"))
-		}()
-		exutil.PatchResource(oc, exutil.AsAdmin, exutil.WithoutNamespace, "apiserver", "cluster", "-p", "{\"spec\":{\"audit\":{\"profile\":\"AllRequestBodies\"}}}", "--type=merge")
-		output = olmv0util.GetResource(oc, exutil.AsAdmin, exutil.WithoutNamespace, "apiserver", "cluster", "-o=jsonpath={.spec.audit.profile}")
-		o.Expect(output).To(o.Equal("AllRequestBodies"))
-
-		g.By("4) Wait for api rollout")
-		err = wait.PollUntilContextTimeout(context.TODO(), 30*time.Second, 600*time.Second, false, func(ctx context.Context) (bool, error) {
-			output, err := oc.AsAdmin().WithoutNamespace().Run("get").Args("kubeapiserver", "-o=jsonpath={..status.conditions[?(@.type==\"NodeInstallerProgressing\")]}").Output()
-			e2e.Logf("kubeapiserver status output: %s", output)
-			if err != nil {
-				e2e.Logf("Fail to get kubeapiserver status, go next round")
-				return false, nil
-			}
-			if !strings.Contains(output, "AllNodesAtLatestRevision") {
-				e2e.Logf("the api is rolling, go next round")
-				return false, nil
-			}
-			result := reg.FindAllStringSubmatch(output, -1)
-			if result != nil {
-				revisionNumberStr2 := result[0][1]
-				revisionNumber2, _ := strconv.Atoi(revisionNumberStr2)
-				e2e.Logf("revision number is : %v", revisionNumber2)
-				if revisionNumber2 > revisionNumber1 {
-					return true, nil
-				}
-				e2e.Logf("revision number is not changed, go next round")
-				return false, nil
-
-			}
-			e2e.Logf("Fail to get revision number, go next round")
-			return false, nil
-		})
-		exutil.AssertWaitPollNoErr(err, "api not rollout")
-
-		// According to the case steps, wait for 5 minutes, then check the audit log doesn't contain olm-operator-serviceaccount.
-		g.By("Wait for 5 minutes, then check the audit log")
-		time.Sleep(5 * time.Minute)
-
-		g.By("check the audit log")
-		nodeName, err := exutil.GetFirstMasterNode(oc)
-		e2e.Logf("master node name: %s", nodeName)
-		o.Expect(err).NotTo(o.HaveOccurred())
-		auditlogPath := "43975.log"
-		defer func() {
-			_, _ = exec.Command("bash", "-c", "rm -fr "+auditlogPath).Output()
-		}()
-		outputPath, err := oc.AsAdmin().WithoutNamespace().Run("adm").Args("node-logs", nodeName, "--path=kube-apiserver/audit.log").OutputToFile(auditlogPath)
-		o.Expect(err).NotTo(o.HaveOccurred())
-		commandParserLog := "cat " + outputPath + " | grep -i health | grep -i subjectaccessreviews | grep -v Unhealth | jq -r '.user.username' | sort | uniq"
-		resultParserLog, err := exec.Command("bash", "-c", commandParserLog).Output()
-		o.Expect(err).NotTo(o.HaveOccurred())
-		e2e.Logf("Found usernames in audit log: %s", string(resultParserLog))
-		o.Expect(resultParserLog).NotTo(o.ContainSubstring("olm-operator-serviceaccount"))
-	})
-
 })