Skip to content

Commit

Permalink
Merge deploy.sh from develop to master
Browse files Browse the repository at this point in the history
  • Loading branch information
wangzihe committed Jul 10, 2019
1 parent 60765da commit 3fb39f0
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions deploy.sh
Original file line number Diff line number Diff line change
@@ -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 [email protected] 'docker ps -a | wc -l'`
docker_num_in_145=`echo $docker_num_in_145 | tr -d "\r"`
Expand Down

0 comments on commit 3fb39f0

Please sign in to comment.