Upgrade e2e 4.0 version and fix 1.12 env error (pingcap#2491) (pingca…

…p#2494)
sre-bot · May 19, 2020 · 487a5b5 · 487a5b5
1 parent 5135a10
commit 487a5b5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/tests/e2e/util/image/image.go b/tests/e2e/util/image/image.go
@@ -30,7 +30,7 @@ const (
 	TiDBV3Version                 = "v3.0.8"
 	TiDBV3UpgradeVersion          = "v3.0.9"
 	TiDBV4Version                 = "v4.0.0-rc"
-	TiDBV4UpgradeVersion          = "nightly"
+	TiDBV4UpgradeVersion          = "v4.0.0-rc.2"
 	PrometheusImage               = "prom/prometheus"
 	PrometheusVersion             = "v2.11.1"
 	TiDBMonitorReloaderImage      = "pingcap/tidb-monitor-reloader"

diff --git a/tests/e2e/util/util.go b/tests/e2e/util/util.go
@@ -41,7 +41,7 @@ func WaitForAPIServicesAvaiable(client aggregatorclientset.Interface, selector l
 		}
 		return false
 	}
-	return wait.PollImmediate(5*time.Second, 3*time.Minute, func() (bool, error) {
+	return wait.PollImmediate(5*time.Second, 10*time.Minute, func() (bool, error) {
 		apiServiceList, err := client.ApiregistrationV1().APIServices().List(metav1.ListOptions{
 			LabelSelector: selector.String(),
 		})