Merge branch 'master' into feature/support-ssh-agent

pingcap · Jun 9, 2021 · c2e6821 · c2e6821
2 parents 08b5106 + 4f5dacc
commit c2e6821
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/release-tiup.yaml b/.github/workflows/release-tiup.yaml
@@ -89,7 +89,9 @@ jobs:
           fi
           echo ::set-output name=REL_VER::$REL_VER
 
-          BUILD_FLAGS='-trimpath -buildmode=pie' make build ctl && echo "Build success."
+          BUILD_FLAGS='-trimpath -buildmode=pie' make build && \
+          BUILD_FLAGS='-trimpath -buildmode=pie' make ctl && \
+          echo "Build success."
 
           checksum_file=checksum.${{ matrix.os }}-${{ matrix.arch }}.txt
           checksum_header="TiUP $REL_VER (${actor}@${event}) ${{ github.run_id }}"
@@ -116,7 +118,6 @@ jobs:
           wget -O $TMP_DIR/tiup-linux-amd64.tar.gz -q https://tiup-mirrors.pingcap.com/tiup-linux-amd64.tar.gz
           tar -zxf $TMP_DIR/tiup-linux-amd64.tar.gz -C $TIUP_HOME/bin && chmod 755 $TIUP_HOME/bin/tiup
           curl -s https://tiup-mirrors.pingcap.com/root.json -o $TIUP_HOME/bin/root.json
-          $TIUP_HOME/bin/tiup update --self
 
           mkdir -p package
           cp $TIUP_HOME/bin/root.json bin/root.json

diff --git a/tests/tiup-cluster/script/cmd_subtest.sh b/tests/tiup-cluster/script/cmd_subtest.sh
@@ -18,7 +18,7 @@ function cmd_subtest() {
 
     client=""
     if [ $native_ssh == true ]; then
-        client="--native-ssh"
+        client="--ssh=system"
     fi
 
     # identify SSH via ssh-agent

diff --git a/tests/tiup-cluster/script/scale_core.sh b/tests/tiup-cluster/script/scale_core.sh
@@ -11,7 +11,7 @@ function scale_core() {
 
     client=""
     if [ $native_ssh == true ]; then
-        client="--native-ssh"
+        client="--ssh=system"
     fi
 
     name="test_scale_core_$RANDOM"

diff --git a/tests/tiup-cluster/script/scale_tools.sh b/tests/tiup-cluster/script/scale_tools.sh
@@ -11,7 +11,7 @@ function scale_tools() {
 
     client=""
     if [ $native_ssh == true ]; then
-        client="--native-ssh"
+        client="--ssh=system"
     fi
 
     name="test_scale_tools_$RANDOM"

diff --git a/tests/tiup-cluster/script/util.sh b/tests/tiup-cluster/script/util.sh
@@ -13,7 +13,7 @@ function instance_num() {
 
     client=""
     if [ $native_ssh == true ]; then
-        client="--native-ssh"
+        client="--ssh=system"
     fi
 
     count=$(tiup-cluster $client display $name | grep "Total nodes" | awk -F ' ' '{print $3}')
@@ -31,7 +31,7 @@ function wait_instance_num_reach() {
 
     client=""
     if [ $native_ssh == true ]; then
-        client="--native-ssh"
+        client="--ssh=system"
     fi
 
     for ((i=0;i<120;i++))