ignore delmark when add minmax for pk column (pingcap#4746) (pingcap#…

…4963) * ignore delmark when add minmax for pk column (pingcap#4746) close pingcap#4747 * fix static analysis * use release-5.4 branch image for other components * fix fullstack image
lidezhu · May 31, 2022 · 03b2bd4 · 03b2bd4
1 parent 566eb07
commit 03b2bd4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/tests/docker/run.sh b/tests/docker/run.sh
@@ -50,11 +50,9 @@ function wait_env() {
 # TAG:        tiflash hash, default to `master`
 # XYZ_BRANCH: pd/tikv/tidb hash, default to `master`
 # BRANCH:     hash short cut, default to `master`
-if [ -n "$BRANCH" ]; then
-  [ -z "$PD_BRANCH" ] && export PD_BRANCH="$BRANCH"
-  [ -z "$TIKV_BRANCH" ] && export TIKV_BRANCH="$BRANCH"
-  [ -z "$TIDB_BRANCH" ] && export TIDB_BRANCH="$BRANCH"
-fi
+export PD_BRANCH="release-5.4"
+export TIKV_BRANCH="release-5.4"
+export TIDB_BRANCH="release-5.4"
 
 
 # Stop all docker instances if exist.

diff --git a/tests/docker/util.sh b/tests/docker/util.sh
@@ -77,12 +77,10 @@ function wait_tiflash_env() {
 function set_branch() {
   # XYZ_BRANCH: pd/tikv/tidb hash, default to `master`
   # BRANCH:     hash short cut, default to `master`
-  if [ -n "$BRANCH" ]; then
-    [ -z "$PD_BRANCH" ] && export PD_BRANCH="$BRANCH"
-    [ -z "$TIKV_BRANCH" ] && export TIKV_BRANCH="$BRANCH"
-    [ -z "$TIDB_BRANCH" ] && export TIDB_BRANCH="$BRANCH"
-  fi
-  echo "use branch \`${BRANCH-master}\` for ci test"
+  export PD_BRANCH="release-5.4"
+  export TIKV_BRANCH="release-5.4"
+  export TIDB_BRANCH="release-5.4"
+  echo "use branch \`${PD_BRANCH}\` for ci test"
 }
 
 function clean_data_log() {