From 5f539dc25002074b22bb417efa0f6f5c43e089b6 Mon Sep 17 00:00:00 2001 From: eh552t Date: Tue, 9 Apr 2019 17:12:03 +0200 Subject: Reworked CSIT for Dublin part1 Change-Id: I3fd53deb61a8ba1c8f6bc68c60f2122e2e0cfb79 Signed-off-by: eh552t Issue-ID: CLAMP-276 --- scripts/clamp/clone_clamp_and_change_dockercompose.sh | 4 ++-- scripts/clamp/start_clamp_containers.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts/clamp') diff --git a/scripts/clamp/clone_clamp_and_change_dockercompose.sh b/scripts/clamp/clone_clamp_and_change_dockercompose.sh index 4e3eb582..c807091e 100755 --- a/scripts/clamp/clone_clamp_and_change_dockercompose.sh +++ b/scripts/clamp/clone_clamp_and_change_dockercompose.sh @@ -41,5 +41,5 @@ sed -i '/image: onap\/clamp/c\ image: nexus3.onap.org:10001\/onap\/clamp' doc sed -i 's/}/,\"clamp.config.policy.pdpUrl1\":\"http:\/\/third_party_proxy:8085\/pdp\/ , testpdp, alpha123\",\"clamp.config.policy.pdpUrl2\":\"http:\/\/third_party_proxy:8085\/pdp\/ , testpdp, alpha123\",\"clamp.config.policy.papUrl\":\"http:\/\/third_party_proxy:8085\/pap\/ , testpap, alpha123\",\"clamp.config.policy.clientId\":\"python\",\"clamp.config.policy.clientKey\":\"dGVzdA==\",\"clamp.config.sdc.catalog.url\":\"http:\/\/third_party_proxy:8085\/sdc\/v1\/catalog\/\",\"clamp.config.sdc.hostUrl\":\"http:\/\/third_party_proxy:8085\",\"clamp.config.sdc.serviceUrl\":\"http:\/\/third_party_proxy:8085\/sdc\/v1\/catalog\/services\",\"clamp.config.dcae.inventory.url\":\"http:\/\/third_party_proxy:8085\",\"clamp.config.dcae.dispatcher.url\":\"http:\/\/third_party_proxy:8085\",\"spring.profiles.active\":\"clamp-default,clamp-default-user,clamp-sdc-controller\",\"server.ssl.client-auth\":\"want\"}/g' clamp.env # Add the sql to create template so it is played by docker-compose later -cp ../../../src/test/resources/sql/four_templates_only.sql ../../sql/bulkload/ -echo 'mysql -uroot -p$MYSQL_ROOT_PASSWORD -f < four_templates_only.sql' >> ../../sql/load-sql-files-tests-automation.sh +cp ../../../src/test/resources/sql/loop-examples.sql ../../sql/bulkload/ +echo 'mysql -uroot -p$MYSQL_ROOT_PASSWORD -f < loop-examples.sql' >> ../../sql/load-sql-files-tests-automation.sh diff --git a/scripts/clamp/start_clamp_containers.sh b/scripts/clamp/start_clamp_containers.sh index 8da83405..443c9fa0 100755 --- a/scripts/clamp/start_clamp_containers.sh +++ b/scripts/clamp/start_clamp_containers.sh @@ -49,5 +49,5 @@ if [ "$TIME" -ge "$TIME_OUT" ]; then exit 1; fi -sleep 30 +sleep 20 -- cgit 1.2.3-korg