install tidb-operator in test namespace in non-parallel test specs (#…

…2029) * install tidb-operator in test namespace in non-parallel test specs * check tidb pods only
pingcap · Mar 28, 2020 · 76a1de8 · 76a1de8
1 parent 0fe67bf
commit 76a1de8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/tests/e2e/tidbcluster/serial.go b/tests/e2e/tidbcluster/serial.go
@@ -115,7 +115,7 @@ var _ = ginkgo.Describe("[tidb-operator][Serial]", func() {
 
 		ginkgo.BeforeEach(func() {
 			ocfg = &tests.OperatorConfig{
-				Namespace:   "pingcap",
+				Namespace:   ns,
 				ReleaseName: "operator",
 				Image:       cfg.OperatorImage,
 				Tag:         cfg.OperatorTag,
@@ -219,7 +219,7 @@ var _ = ginkgo.Describe("[tidb-operator][Serial]", func() {
 
 		ginkgo.BeforeEach(func() {
 			ocfg = &tests.OperatorConfig{
-				Namespace:      "pingcap",
+				Namespace:      ns,
 				ReleaseName:    "operator",
 				Image:          cfg.OperatorImage,
 				Tag:            cfg.OperatorTag,
@@ -410,7 +410,7 @@ var _ = ginkgo.Describe("[tidb-operator][Serial]", func() {
 		var genericCli client.Client
 
 		ocfg = &tests.OperatorConfig{
-			Namespace:      "pingcap",
+			Namespace:      ns,
 			ReleaseName:    "operator",
 			Image:          cfg.OperatorImage,
 			Tag:            cfg.OperatorTag,
@@ -458,7 +458,7 @@ var _ = ginkgo.Describe("[tidb-operator][Serial]", func() {
 			e2elog.Failf("at least 3 statefulsets must be created, got %d", len(stsList.Items))
 		}
 
-		podListBeforeUpgrade, err := c.CoreV1().Pods(tc.Namespace).List(metav1.ListOptions{})
+		podListBeforeUpgrade, err := c.CoreV1().Pods(tc.Namespace).List(listOption)
 		framework.ExpectNoError(err)
 
 		ginkgo.By("Upgrading tidb-operator with AdvancedStatefulSet feature")
@@ -493,7 +493,7 @@ var _ = ginkgo.Describe("[tidb-operator][Serial]", func() {
 
 		ginkgo.By("Make sure pods are not changed")
 		err = utilpod.WaitForPodsAreChanged(c, podListBeforeUpgrade.Items, time.Minute*3)
-		framework.ExpectEqual(err, wait.ErrWaitTimeout, "Pods was not affeteced after the operator is upgraded")
+		framework.ExpectEqual(err, wait.ErrWaitTimeout, "Pods are changed after the operator is upgraded")
 	})
 
 	// tidb-operator with pod admission webhook enabled
@@ -504,7 +504,7 @@ var _ = ginkgo.Describe("[tidb-operator][Serial]", func() {
 
 		ginkgo.BeforeEach(func() {
 			ocfg = &tests.OperatorConfig{
-				Namespace:         "pingcap",
+				Namespace:         ns,
 				ReleaseName:       "operator",
 				Image:             cfg.OperatorImage,
 				Tag:               cfg.OperatorTag,
@@ -558,7 +558,7 @@ var _ = ginkgo.Describe("[tidb-operator][Serial]", func() {
 
 		ginkgo.BeforeEach(func() {
 			ocfg = &tests.OperatorConfig{
-				Namespace:                 "pingcap",
+				Namespace:                 ns,
 				ReleaseName:               "operator",
 				Image:                     cfg.OperatorImage,
 				Tag:                       cfg.OperatorTag,

diff --git a/tests/e2e/tidbcluster/stability.go b/tests/e2e/tidbcluster/stability.go
@@ -97,7 +97,7 @@ var _ = ginkgo.Describe("[tidb-operator][Stability]", func() {
 
 		ginkgo.BeforeEach(func() {
 			ocfg = &tests.OperatorConfig{
-				Namespace:   "pingcap",
+				Namespace:   ns,
 				ReleaseName: "operator",
 				Image:       cfg.OperatorImage,
 				Tag:         cfg.OperatorTag,