From 60765da86737eced3d3db2d43ca1e9a38cee9e9a Mon Sep 17 00:00:00 2001 From: wangzihe Date: Wed, 10 Jul 2019 15:19:52 +0800 Subject: [PATCH 1/2] Change tron.enc and tron.sh for update pub_key --- tron.enc | Bin 1680 -> 1680 bytes tron.sh | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tron.enc b/tron.enc index 75043fb96ce9b1dea14a6495314d2f965f0d2b44..c69628695b51ba6e6766f813b64d3dd39f482ed6 100644 GIT binary patch literal 1680 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 a;SJbr7j=cbMvm(PzAg^0)R!;IjklBQ%QwOR diff --git a/tron.sh b/tron.sh index d2c435f71a2..58cdfa90388 100644 --- a/tron.sh +++ b/tron.sh @@ -1,7 +1,7 @@ #!/bin/bash -if [ $encrypted_e5855cb9e09c_key ];then - openssl aes-256-cbc -K $encrypted_e5855cb9e09c_key -iv $encrypted_e5855cb9e09c_iv -in tron.enc -out tron -d +if [ $encrypted_43b7d2f1321f_key ];then + openssl aes-256-cbc -K $encrypted_43b7d2f1321f_key -iv $encrypted_43b7d2f1321f_iv -in tron.enc -out tron -d cat tron > ~/.ssh/id_rsa chmod 600 ~/.ssh/id_rsa echo "Add docker server success" From 3fb39f0e00125630d3e57adcff52dffc417826b1 Mon Sep 17 00:00:00 2001 From: wangzihe Date: Wed, 10 Jul 2019 15:33:45 +0800 Subject: [PATCH 2/2] Merge deploy.sh from develop to master --- deploy.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/deploy.sh b/deploy.sh index 879e9614287..b6305f94fa0 100644 --- a/deploy.sh +++ b/deploy.sh @@ -1,8 +1,10 @@ #!/bin/bash if [[ "$TRAVIS_BRANCH" = "develop" || "$TRAVIS_BRANCH" = "master" ]];then stestlogname="`date +%Y%m%d%H%M%S`_stest.log" + echo "try to test stest_server network" timeout 10 ping -c 5 47.93.42.145 > /dev/null || exit 1 timeout 10 ping -c 5 47.93.18.60 > /dev/null || exit 1 + echo "stest_server network good" stest_server="" docker_num_in_145=`ssh -p 22008 -t java-tron@47.93.42.145 'docker ps -a | wc -l'` docker_num_in_145=`echo $docker_num_in_145 | tr -d "\r"`