test: update tidb version (#1847)

pingcap · May 12, 2022 · f062b88 · f062b88
1 parent 4f8a44a
commit f062b88
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/tests/tiup-cluster/test_cmd_tls_native_ssh.sh b/tests/tiup-cluster/test_cmd_tls_native_ssh.sh
@@ -6,6 +6,6 @@ source script/cmd_subtest.sh
 export GO_FAILPOINTS='github.com/pingcap/tiup/pkg/cluster/executor/assertNativeSSH=return(true)'
 
 echo "test cluster for version v4.0.12 w/ TLS, via native ssh"
-cmd_subtest 4.0.12 true true
+cmd_subtest 6.0.0 true true
 
 unset GO_FAILPOINTS
diff --git a/tests/tiup-cluster/test_scale_core.sh b/tests/tiup-cluster/test_scale_core.sh
@@ -5,4 +5,4 @@ set -eu
 source script/scale_core.sh
 
 echo "test scaling of core components in cluster for version v4.0.12 wo/ TLS, via easy ssh"
-scale_core v4.0.12 false false
+scale_core v6.0.0 false false
diff --git a/tests/tiup-cluster/test_scale_core_tls.sh b/tests/tiup-cluster/test_scale_core_tls.sh
@@ -5,4 +5,4 @@ set -eu
 source script/scale_core.sh
 
 echo "test scaling of core components in cluster for version v5.3.0 w/ TLS, via easy ssh"
-scale_core v5.3.0 true false
+scale_core v4.0.12 true false
diff --git a/tests/tiup-cluster/test_scale_tools_tls.sh b/tests/tiup-cluster/test_scale_tools_tls.sh
@@ -5,4 +5,4 @@ set -eu
 source script/scale_tools.sh
 
 echo "test scaling of tools components in cluster for version v5.3.0 w/ TLS, via easy ssh"
-scale_tools v5.3.0 true false
+scale_tools v6.0.0 true false
diff --git a/tests/tiup-cluster/test_upgrade_tls.sh b/tests/tiup-cluster/test_upgrade_tls.sh
@@ -3,7 +3,7 @@
 set -eu
 
 old_version=${old_version-v4.0.15}
-version=${version-v5.3.0}
+version=${version-v6.0.0}
 
 source script/upgrade.sh
 

diff --git a/tests/tiup-playground/test_playground.sh b/tests/tiup-playground/test_playground.sh
@@ -47,11 +47,12 @@ function kill_all() {
     killall -9 grafana-server || true
     killall -9 tiup-playground || true
     killall -9 prometheus || true
+    killall -9 ng-monitoring-server || true
     cat $outfile
 }
 
 outfile=/tmp/tiup-playground-test.out
-tiup-playground v5.0.1 > $outfile 2>&1 &
+tiup-playground v6.0.0 > $outfile 2>&1 &
 
 # wait $outfile generated
 sleep 3
@@ -98,10 +99,10 @@ tiup-playground display | grep -E "terminated|exit" | wc -l | grep -q "1"
 
 killall -2 tiup-playground.test || killall -2 tiup-playground
 
-sleep 60
+sleep 100
 
 # test restart with same data
-tiup-playground v5.0.1 > $outfile 2>&1 &
+tiup-playground v6.0.0 > $outfile 2>&1 &
 
 # wait $outfile generated
 sleep 3