aboutsummaryrefslogtreecommitdiffstats
path: root/test/csit/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'test/csit/scripts')
-rwxr-xr-xtest/csit/scripts/optf-has/has/has_script.sh12
-rwxr-xr-xtest/csit/scripts/optf-has/has/has_teardown_script.sh8
-rwxr-xr-xtest/csit/scripts/optf-has/has/music_script.sh3
-rwxr-xr-xtest/csit/scripts/optf-has/has/music_teardown_script.sh2
4 files changed, 13 insertions, 12 deletions
diff --git a/test/csit/scripts/optf-has/has/has_script.sh b/test/csit/scripts/optf-has/has/has_script.sh
index a5bf9f999..7d207f0b0 100755
--- a/test/csit/scripts/optf-has/has/has_script.sh
+++ b/test/csit/scripts/optf-has/has/has_script.sh
@@ -50,12 +50,12 @@ echo "MUSIC_IP=${MUSIC_IP}"
# change MUSIC reference to the local instance
sed -i -e "s%localhost:8080/MUSIC%${MUSIC_IP}:8080/MUSIC%g" /tmp/conductor/properties/conductor.conf
-AAISIM_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' aaisim`
-echo "AAISIM_IP=${AAISIM_IP}"
-
#onboard conductor into music
curl -vvvvv --noproxy "*" --request POST http://${MUSIC_IP}:8080/MUSIC/rest/v2/admin/onboardAppWithMusic -H "Content-Type: application/json" --data @${WORKSPACE}/test/csit/tests/optf-has/has/data/onboard.json
+AAISIM_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' aaisim`
+echo "AAISIM_IP=${AAISIM_IP}"
+
# change MUSIC reference to the local instance
sed -i -e "s%localhost:8081/%${AAISIM_IP}:8081/%g" /tmp/conductor/properties/conductor.conf
@@ -80,6 +80,6 @@ docker inspect cond-api
docker inspect cond-solv
docker inspect cond-resv
-docker exec -it music-db /usr/bin/nodetool status
-docker exec -it music-db /usr/bin/cqlsh -unelson24 -pwinman123 -e 'SELECT * FROM system_schema.keyspaces'
-docker exec -it music-db /usr/bin/cqlsh -unelson24 -pwinman123 -e 'SELECT * FROM admin.keyspace_master'
+docker exec music-db /usr/bin/nodetool status
+docker exec music-db /usr/bin/cqlsh -unelson24 -pwinman123 -e 'SELECT * FROM system_schema.keyspaces'
+docker exec music-db /usr/bin/cqlsh -unelson24 -pwinman123 -e 'SELECT * FROM admin.keyspace_master'
diff --git a/test/csit/scripts/optf-has/has/has_teardown_script.sh b/test/csit/scripts/optf-has/has/has_teardown_script.sh
index dcf41648c..bef28b435 100755
--- a/test/csit/scripts/optf-has/has/has_teardown_script.sh
+++ b/test/csit/scripts/optf-has/has/has_teardown_script.sh
@@ -14,10 +14,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-#echo "print meaningful data before scratching everything"
-#docker exec -it music-db /usr/bin/cqlsh -unelson24 -pwinman123 -e 'SELECT * FROM system_schema.keyspaces'
-#docker exec -it music-db /usr/bin/cqlsh -unelson24 -pwinman123 -e 'SELECT * FROM admin.keyspace_master'
-#docker exec -it music-db /usr/bin/cqlsh -unelson24 -pwinman123 -e 'SELECT * FROM conductor.plans'
+echo "print meaningful data before scratching everything"
+docker exec music-db /usr/bin/cqlsh -unelson24 -pwinman123 -e 'SELECT * FROM system_schema.keyspaces'
+docker exec music-db /usr/bin/cqlsh -unelson24 -pwinman123 -e 'SELECT * FROM admin.keyspace_master'
+docker exec music-db /usr/bin/cqlsh -unelson24 -pwinman123 -e 'SELECT * FROM conductor.plans'
echo "optf/has scripts docker containers killing";
docker stop cond-api
diff --git a/test/csit/scripts/optf-has/has/music_script.sh b/test/csit/scripts/optf-has/has/music_script.sh
index be4eb8c63..fb43e1b8b 100755
--- a/test/csit/scripts/optf-has/has/music_script.sh
+++ b/test/csit/scripts/optf-has/has/music_script.sh
@@ -80,6 +80,8 @@ echo "TOMCAT_IP=${TOMCAT_IP}"
${WORKSPACE}/test/csit/scripts/optf-has/has/wait_for_port.sh ${TOMCAT_IP} 8080
+# wait a while to make sure music is totally up and configured
+sleep 10
echo "inspect docker things for tracing purpose"
docker inspect music-db
@@ -94,4 +96,3 @@ docker network inspect music-net
-
diff --git a/test/csit/scripts/optf-has/has/music_teardown_script.sh b/test/csit/scripts/optf-has/has/music_teardown_script.sh
index fa91f6e97..605ebd4e8 100755
--- a/test/csit/scripts/optf-has/has/music_teardown_script.sh
+++ b/test/csit/scripts/optf-has/has/music_teardown_script.sh
@@ -34,6 +34,6 @@ echo "dump music.log files"
ls -alF /tmp/music
ls -alF /tmp/music/properties
cat /tmp/music/properties/music.properties
-cat /tmp/music/logs/MUSIC/music.log
+#cat /tmp/music/logs/MUSIC/music.log
cat /tmp/music/logs/MUSIC/error.log