cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [12/24] git commit: updated refs/heads/master to 6fd49e4
Date Sun, 21 Jun 2015 13:14:08 GMT
Add timeout to nc command, as it was waiting forever and not going through the while loop.
This will make sure nc gets restared to retry in case something nasty is happening in the
running process

host command not present in build env, switch to getent
second phase of dep download turning some error, print failure log

Signed-off-by: Daan Hoogland <daan@onecht.net>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7838bfcc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7838bfcc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7838bfcc

Branch: refs/heads/master
Commit: 7838bfcc70efc111e9f838353081af6fe0aec51a
Parents: c1c0382
Author: Rafael da Fonseca <rsafonseca@gmail.com>
Authored: Thu Jun 18 23:54:53 2015 +0200
Committer: Daan Hoogland <daan@onecht.net>
Committed: Sun Jun 21 15:13:25 2015 +0200

----------------------------------------------------------------------
 tools/travis/before_install.sh | 7 ++++---
 tools/travis/before_script.sh  | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7838bfcc/tools/travis/before_install.sh
----------------------------------------------------------------------
diff --git a/tools/travis/before_install.sh b/tools/travis/before_install.sh
index 6970d90..4b789e1 100755
--- a/tools/travis/before_install.sh
+++ b/tools/travis/before_install.sh
@@ -99,7 +99,7 @@ do
  fi
  echo -e "\nDependency download failed"
  #Test DNS record
- host repo1.maven.org
+ getent hosts repo1.maven.org
  while ! nc -vzw 5 repo1.maven.org 80; do echo -e "\nFailed to connect to repo1.maven.org:80
will retry in 10 seconds"; sleep 10; done
 done
 
@@ -111,14 +111,15 @@ echo -e "$(cat pom.xml |wc -l) lines in dummy pom.xml"
 
 for ((i=0;i<$RETRY_COUNT;i++))
 do
- mvn org.apache.maven.plugins:maven-dependency-plugin:resolve > /dev/null
+ mvn org.apache.maven.plugins:maven-dependency-plugin:resolve > /tmp/phase2
  if [[ $? -eq 0 ]]; then
    echo -e "\nProject dependencies downloaded successfully"
    break;
  fi
  echo -e "\nDependency download failed"
+ cat /tmp/phase2
  #Test DNS record
- host repo1.maven.org
+ getent hosts repo1.maven.org
  while ! nc -vzw 5 repo1.maven.org 80; do echo -e "\nFailed to connect to repo1.maven.org:80
will retry in 10 seconds"; sleep 10; done
 done
 cd ../..

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7838bfcc/tools/travis/before_script.sh
----------------------------------------------------------------------
diff --git a/tools/travis/before_script.sh b/tools/travis/before_script.sh
index 1c39bf2..ead2851 100755
--- a/tools/travis/before_script.sh
+++ b/tools/travis/before_script.sh
@@ -42,6 +42,6 @@ export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=500m"
 echo -e "\nStarting simulator"
 mvn -Dsimulator -pl :cloud-client-ui jetty:run 2>&1 > /tmp/jetty-log &
 
-while ! nc -vz localhost 8096 2>&1 > /dev/null; do grep Exception /tmp/jetty-log;
sleep 10; done
+while ! nc -vzw 5 localhost 8096 2>&1 > /dev/null; do grep Exception /tmp/jetty-log;
sleep 10; done
 echo -e "\nStarting simulator"
 python -m marvin.deployDataCenter -i setup/dev/advanced.cfg 2>&1 || true


Mime
View raw message