-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge deploy.sh from develop to master
- Loading branch information
wangzihe
committed
Jul 10, 2019
1 parent
60765da
commit 3fb39f0
Showing
1 changed file
with
2 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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"` | ||
|