From a97034802be7540e982564c31e71aa5d1e686ef4 Mon Sep 17 00:00:00 2001
From: sunny299 <62001098+sunny299@users.noreply.github.com>
Date: Mon, 3 Oct 2022 11:53:25 +0700
Subject: [PATCH] [patch] fix: remove testrunnerOverride condition (#139)

* fix: remove testrunnerOverride condition

* fix: invlid redis tag

* fix: staging e2e test

* remove focus test
---
 internal/staging/util.go |  3 +--
 test/e2e/staging/ctrl.go | 12 ++++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/internal/staging/util.go b/internal/staging/util.go
index 1115c8bb..e919a76f 100644
--- a/internal/staging/util.go
+++ b/internal/staging/util.go
@@ -66,8 +66,7 @@ func (c *controller) getTestConfiguration(queue *s2hv1.Queue) *s2hv1.ConfigTestR
 	}
 
 	// try to infer gitlab MR branch in PR flow
-	if queue.IsPullRequestQueue() && testRunner != nil &&
-		testRunnerOverrider.Gitlab.Branch == nil {
+	if queue.IsPullRequestQueue() && testRunner != nil {
 		gitlabClientGetter := func() gitlab.Gitlab {
 			return gitlab.NewClient(c.gitlabBaseURL, c.gitlabToken)
 		}
diff --git a/test/e2e/staging/ctrl.go b/test/e2e/staging/ctrl.go
index 78ae4973..35bc4a6a 100644
--- a/test/e2e/staging/ctrl.go
+++ b/test/e2e/staging/ctrl.go
@@ -169,11 +169,11 @@ var _ = Describe("[e2e] Staging controller", func() {
 		Chart: s2hv1.ComponentChart{
 			Repository: "https://charts.bitnami.com/bitnami",
 			Name:       redisCompName,
-			Version:    "12.10.1",
+			Version:    "17.2.0",
 		},
 		Image: s2hv1.ComponentImage{
 			Repository: "bitnami/redis",
-			Pattern:    "5.*debian-9.*",
+			Pattern:    ".*debian-.*",
 		},
 		Source: &compSource,
 		Values: s2hv1.ComponentValues{
@@ -534,7 +534,7 @@ var _ = Describe("[e2e] Staging controller", func() {
 		Expect(err).NotTo(HaveOccurred(), "Testing error")
 
 		By("Collecting")
-		err = wait.PollImmediate(2*time.Second, 60*time.Second, func() (ok bool, err error) {
+		err = wait.PollImmediate(2*time.Second, 90*time.Second, func() (ok bool, err error) {
 			redisStableComp := &s2hv1.StableComponent{}
 			err = client.Get(ctx, types.NamespacedName{Namespace: namespace, Name: redisCompName},
 				redisStableComp)
@@ -581,7 +581,7 @@ var _ = Describe("[e2e] Staging controller", func() {
 			}
 
 			for _, p := range svc.Spec.Ports {
-				if p.NodePort == 31002 {
+				if p.NodePort != 0 {
 					ok = true
 					return
 				}
@@ -641,7 +641,7 @@ var _ = Describe("[e2e] Staging controller", func() {
 		By("Delete Promote to Active Queue")
 		Expect(queue.DeletePromoteToActiveQueue(client, namespace))
 
-	}, 300)
+	}, 330)
 
 	It("should successfully deploy pull request type", func() {
 		authToken := "12345"
@@ -761,7 +761,7 @@ var _ = Describe("[e2e] Staging controller", func() {
 		go stagingCtrl.Start(chStop)
 
 		redis := queue.NewQueue(teamName, namespace, redisCompName, "",
-			s2hv1.QueueComponents{{Name: redisCompName, Repository: "bitnami/redis", Version: "5.0.5-debian-9-r185"}},
+			s2hv1.QueueComponents{{Name: redisCompName, Repository: "bitnami/redis", Version: "7.0.4-debian-11-r13"}},
 			s2hv1.QueueTypeUpgrade,
 		)
 		Expect(client.Create(ctx, redis)).To(BeNil())