diff options
| -rwxr-xr-x | plans/music/music-test-plan/setup.sh | 8 | ||||
| -rwxr-xr-x | plans/music/music-test-plan/teardown.sh | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/plans/music/music-test-plan/setup.sh b/plans/music/music-test-plan/setup.sh index add34b1a..1b4896ef 100755 --- a/plans/music/music-test-plan/setup.sh +++ b/plans/music/music-test-plan/setup.sh @@ -68,17 +68,15 @@ docker run -d --name music-db --network music-net -p "7000:7000" -p "7001:7001" -v $MUSIC_TRIGGER_DIR/$TRIGGER_JAR:/etc/cassandra/triggers/$TRIGGER_JAR \ ${CASS_IMG}; +# See if cassandra is up. +echo "########## Running Test to see if Cassandra is up ##########" CASSA_IP=`docker inspect -f '{{ $network := index .NetworkSettings.Networks "music-net" }}{{ $network.IPAddress}}' music-db` echo "CASSANDRA_IP=${CASSA_IP}" ${WORKSPACE}/scripts/optf-has/has/wait_for_port.sh ${CASSA_IP} 9042 -# See if cassandra is up. -echo "########## Running Test to see if Cassandra is up ##########" -docker run --name music-casstest --network music-net \ -$BUSYBOX_IMG sh -c "until nc -z music-db 9042 && echo "success"; do echo 'No connection .. Sleeping for $TT seconds';sleep $TT; done;" - # Sleep 60 seconds to ensure Cassandra is up and running. sleep 60; + # Check to see if Keyspaces are there. docker exec music-db cqlsh -u cassandra -p cassandra -e "DESCRIBE keyspaces;" diff --git a/plans/music/music-test-plan/teardown.sh b/plans/music/music-test-plan/teardown.sh index e05ef9d1..2e7d707b 100755 --- a/plans/music/music-test-plan/teardown.sh +++ b/plans/music/music-test-plan/teardown.sh @@ -40,14 +40,12 @@ docker stop music-tomcat docker stop music-war docker stop music-zk docker stop music-job -docker stop music-casstest docker stop music-db docker rm music-zk docker rm music-tomcat docker rm music-war docker rm music-job -docker rm music-casstest docker rm music-db docker network rm music-net; |