diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2019-04-09 15:26:22 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-04-09 15:26:22 +0000 |
| commit | 166a129effc579e899713bfc526a17862ea23484 (patch) | |
| tree | ed417600143566c50fc1cc0efb32559a7a041916 /scripts | |
| parent | 556fdd65f0bbdff4c3d557d0c38f9e9590fe8232 (diff) | |
| parent | 5f539dc25002074b22bb417efa0f6f5c43e089b6 (diff) | |
Merge "Reworked CSIT for Dublin part1"
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/clamp/clone_clamp_and_change_dockercompose.sh | 4 | ||||
| -rwxr-xr-x | scripts/clamp/start_clamp_containers.sh | 2 |
2 files changed, 3 insertions, 3 deletions
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 |