Browse Source

Revert "Add retry limit for mongo and cassandra inside travis-CI"

This reverts commit aca346bd27f9be3319853962277d329c692b8b12.
Hamilton Turner 10 years ago
parent
commit
62e1ee7bf5
1 changed files with 9 additions and 25 deletions
  1. 9 25
      toolset/run-ci.py

+ 9 - 25
toolset/run-ci.py

@@ -415,34 +415,18 @@ class CIRunnner:
 
     # Setup Apache Cassandra
     echo "Populating Apache Cassandra database"
-    for i in {1..45}; do
-      nc -z localhost 9160 && break || sleep 1;
-      echo "Waiting for Cassandra ($i/45}"
-    done
-    nc -z localhost 9160
-    if [ $? -eq 0 ]; then
-      cat config/cassandra/cleanup-keyspace.cql | sudo cqlsh
-      python config/cassandra/db-data-gen.py > config/cassandra/tfb-data.cql
-      sudo cqlsh -f config/cassandra/create-keyspace.cql
-      sudo cqlsh -f config/cassandra/tfb-data.cql
-    else
-      >&2 echo "Cassandra did not start, skipping"
-    fi
+    until nc -z localhost 9160 ; do echo Waiting for Cassandra; sleep 1; done
+    cat config/cassandra/cleanup-keyspace.cql | sudo cqlsh
+    python config/cassandra/db-data-gen.py > config/cassandra/tfb-data.cql
+    sudo cqlsh -f config/cassandra/create-keyspace.cql
+    sudo cqlsh -f config/cassandra/tfb-data.cql
 
     # Setup MongoDB
     echo "Populating MongoDB database"
-    for i in {1..45}; do
-      nc -z localhost 27017 && break || sleep 1;
-      echo "Waiting for MongoDB ($i/45}"
-    done
-    nc -z localhost 27017
-    if [ $? -eq 0 ]; then
-      mongo < create.js
-      mongod --version
-    else
-      >&2 echo "MongoDB did not start, skipping"
-    fi
-    
+    until nc -z localhost 27017 ; do echo Waiting for MongoDB; sleep 1; done
+    mongod --version
+    mongo < config/create.js
+
     # =============Modify Configurations===========================
     # It can be useful to enable debug features for verification 
     # inside Travis-CI