diff options
| author |   eh552t <eh552t@intl.att.com> | 2019-09-02 16:51:38 +0200 |
|---|---|---|
| committer | eh552t <eh552t@intl.att.com> | 2019-09-02 16:51:46 +0200 |
| commit | 65c3199202e7e44cc81b85fbdcb2f125561ffc2b (patch) | |
| tree | 087aab2b2b7b4266b2df11b9c970ab83e3532a28 /scripts/clamp | |
| parent | 8c6cd4fd37d8958a670235751bc57e43ea4e4d63 (diff) | |
Fix test for clamp-backend and frontend new UI
Signed-off-by: eh552t <eh552t@intl.att.com>
Change-Id: I123876f31dc591184f0986edba4bc9a302779607
Issue-ID: CLAMP-276
Diffstat (limited to 'scripts/clamp')
| -rwxr-xr-x | scripts/clamp/clone_clamp_and_change_dockercompose.sh | 6 | ||||
| -rwxr-xr-x | scripts/clamp/kill_and_remove_clamp_and_db_containers.sh | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/scripts/clamp/clone_clamp_and_change_dockercompose.sh b/scripts/clamp/clone_clamp_and_change_dockercompose.sh index 5970ab2f..0c30b26a 100755 --- a/scripts/clamp/clone_clamp_and_change_dockercompose.sh +++ b/scripts/clamp/clone_clamp_and_change_dockercompose.sh @@ -35,10 +35,8 @@ git clone --depth 1 http://gerrit.onap.org/r/clamp -b $GERRIT_BRANCH cd clamp/extra/docker/clamp/ # Pull the Clamp docker image from nexus instead of local image by default in the docker-compose.yml -sed -i '/image: onap\/clamp/c\ image: nexus3.onap.org:10001\/onap\/clamp:4.0-STAGING-latest' docker-compose.yml - -# Change config to take third_party_proxy:8085 for SDC, Policy and DCAE simulator -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 +sed -i '/image: onap\/clamp-backend/c\ image: nexus3.onap.org:10001\/onap\/clamp-backend:4.1-STAGING-latest' docker-compose.yml +sed -i '/image: onap\/clamp-frontend/c\ image: nexus3.onap.org:10001\/onap\/clamp-frontend:4.1-STAGING-latest' docker-compose.yml # Add the sql to create template so it is played by docker-compose later cp ../../../src/test/resources/sql/loop-examples.sql ../../sql/bulkload/ diff --git a/scripts/clamp/kill_and_remove_clamp_and_db_containers.sh b/scripts/clamp/kill_and_remove_clamp_and_db_containers.sh index 31eb7560..bc796787 100755 --- a/scripts/clamp/kill_and_remove_clamp_and_db_containers.sh +++ b/scripts/clamp/kill_and_remove_clamp_and_db_containers.sh @@ -19,8 +19,9 @@ echo "This is ${WORKSPACE}/scripts/clamp/kill_and_remove_clamp_and_db_containers.sh" -kill-instance.sh clamp_clamp_1 +kill-instance.sh clamp_clamp-backend_1 +kill-instance.sh clamp_clamp-frontend_1 kill-instance.sh clamp_db_1 -kill-instance.sh clamp_third_party_proxy_1 +kill-instance.sh clamp_third-party-proxy_1 # $WORKSPACE/archives/clamp-clone deleted with archives folder when tests starts so we keep it at the end for debugging |