Browse Source

try to fix Cassandra DB setup on CI server

marko asplund 11 years ago
parent
commit
2e744b7757

+ 1 - 0
config/cassandra/cleanup-keyspace.cql

@@ -0,0 +1 @@
+DROP KEYSPACE tfb;

+ 0 - 2
config/cassandra/create-keyspace.cql

@@ -1,6 +1,4 @@
 
 
-DROP KEYSPACE tfb;
-
 CREATE KEYSPACE tfb WITH replication = {'class': 'SimpleStrategy', 'replication_factor': 1 };
 CREATE KEYSPACE tfb WITH replication = {'class': 'SimpleStrategy', 'replication_factor': 1 };
 USE tfb;
 USE tfb;
 
 

+ 3 - 1
toolset/run-ci.py

@@ -349,8 +349,10 @@ class CIRunnner:
 
 
     # Setup Apache Cassandra
     # Setup Apache Cassandra
     until nc -z localhost 9160 ; do echo Waiting for Cassandra; sleep 1; done
     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/create-keyspace.cql
-    python config/cassandra/db-data-gen.py | sudo cqlsh
+    sudo cqlsh -f config/cassandra/tfb-data.cql
 
 
     # Setup MongoDB (see install above)
     # Setup MongoDB (see install above)
     mongod --version
     mongod --version