From 94b01547f55b4609853a3e298bd2a106adc08da5 Mon Sep 17 00:00:00 2001 From: 9547 Date: Wed, 9 Jun 2021 11:34:29 +0800 Subject: [PATCH 1/2] tests/cluster: --native-ssh is deprecated, use --ssh=system (#1418) --- tests/tiup-cluster/script/cmd_subtest.sh | 2 +- tests/tiup-cluster/script/scale_core.sh | 2 +- tests/tiup-cluster/script/scale_tools.sh | 2 +- tests/tiup-cluster/script/util.sh | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/tiup-cluster/script/cmd_subtest.sh b/tests/tiup-cluster/script/cmd_subtest.sh index d7767aab82..a04abd6ed9 100755 --- 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 tiup-cluster $client check $topo -i ~/.ssh/id_rsa --enable-mem --enable-cpu --apply diff --git a/tests/tiup-cluster/script/scale_core.sh b/tests/tiup-cluster/script/scale_core.sh index 553c35e2ed..465c05f52b 100755 --- 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 index 291097f86c..c7d3552914 100755 --- 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 index 32013b2077..4b5bbfbc5a 100755 --- 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++)) From 4f5daccae64e0be8ca492e332b10e88a91dd0d79 Mon Sep 17 00:00:00 2001 From: Allen Zhong Date: Wed, 9 Jun 2021 12:23:05 +0800 Subject: [PATCH 2/2] *: fix release build (#1419) --- .github/workflows/release-tiup.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-tiup.yaml b/.github/workflows/release-tiup.yaml index d8b14da49c..10a9403f7c 100644 --- 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