diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2018-03-12 16:35:13 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-03-12 16:35:13 +0000 |
| commit | 39936a26c3d0a47e145e8df95c06bd682c2a0ce7 (patch) | |
| tree | 3672a8e0820c54d63b73dfed0e30e5b1a3ae1aeb /test/csit/plans/music/music-test-plan/setup.sh | |
| parent | 22cc480ac11243fea6daee191dbd1d2f5bdb9399 (diff) | |
| parent | 293263e2d78c373ebb219744830f4989e330e224 (diff) | |
Merge "correction to pass 1 failed CSIT test"
Diffstat (limited to 'test/csit/plans/music/music-test-plan/setup.sh')
| -rwxr-xr-x | test/csit/plans/music/music-test-plan/setup.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/csit/plans/music/music-test-plan/setup.sh b/test/csit/plans/music/music-test-plan/setup.sh index 228aa1f2f..900ccf660 100755 --- a/test/csit/plans/music/music-test-plan/setup.sh +++ b/test/csit/plans/music/music-test-plan/setup.sh @@ -46,7 +46,7 @@ cp ${MUSIC_SOURCE_PROPERTIES}/* ${MUSIC_PROPERTIES} echo "# music docker containers spinoff"; -docker volume create music-vol +docker volume create --name music-vol docker run -d --name music-war -v music-vol:/app nexus3.onap.org:10001/onap/music/music:latest docker run -d --name music-db -p 7000:7000 -p 7001:7001 -p 7199:7199 -p 9042:9042 -p 9160:9160 nexus3.onap.org:10001/onap/music/cassandra_music:latest docker run -d --name music-zk -p 2181:2181 -p 2888:2888 -p 3888:3888 nexus3.onap.org:10001/library/zookeeper:3.4 @@ -61,10 +61,12 @@ echo "ZOOKEEPER_IP=${ZOO_IP}" ${WORKSPACE}/test/csit/scripts/music/music-scripts/wait_for_port.sh ${CASSA_IP} 9042 docker run -d --name music-tomcat -p 8080:8080 -v music-vol:/usr/local/tomcat/webapps -v ${MUSIC_PROPERTIES}:/opt/app/music/etc:ro -v ${MUSIC_LOGS}:/opt/app/music/logs nexus3.onap.org:10001/library/tomcat:8.0 +sleep 10 TOMCAT_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' music-tomcat` echo "TOMCAT_IP=${TOMCAT_IP}" +${WORKSPACE}/test/csit/scripts/music/music-scripts/wait_for_port.sh ${TOMCAT_IP} 8080 --- old part: it will be removed @@ -80,7 +82,7 @@ echo "TOMCAT_IP=${TOMCAT_IP}" # add here all ROBOT_VARIABLES settings # echo "# music robot variables settings"; -ROBOT_VARIABLES="-v MUSIC_HOSTNAME:http://localhost -v MUSIC_PORT:8080 -v COND_HOSTNAME:http://localhost -v COND_PORT:8091" +ROBOT_VARIABLES="-v MUSIC_HOSTNAME:http://${TOMCAT_IP} -v MUSIC_PORT:8080 -v COND_HOSTNAME:http://localhost -v COND_PORT:8091" echo ${ROBOT_VARIABLES} |