From becc0f905edd450e7cba082240f2c2f3c3d19b87 Mon Sep 17 00:00:00 2001 From: Krzysztof Gajewski Date: Wed, 17 Feb 2021 12:51:58 +0100 Subject: Add HTTPS to DFC tests - CSIT tests are reported to be unstable. This fix prevents some 'permission denied' errors and sftp health checks errors which may occur during non https tests Issue-ID: DCAEGEN2-2528 Signed-off-by: Krzysztof Gajewski Change-Id: Ib5d4042ab8207ced3746c390e63c88fc6b49b851 --- test/mocks/datafilecollector-testharness/common/testcase_common.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'test/mocks/datafilecollector-testharness/common') diff --git a/test/mocks/datafilecollector-testharness/common/testcase_common.sh b/test/mocks/datafilecollector-testharness/common/testcase_common.sh index 345752b47..a0bc4b4df 100755 --- a/test/mocks/datafilecollector-testharness/common/testcase_common.sh +++ b/test/mocks/datafilecollector-testharness/common/testcase_common.sh @@ -392,12 +392,11 @@ __start_dfc_image() { echo "Starting DFC: " $appname " with ports mapped to " $localport " and " $localport_secure " in docker network "$DOCKER_SIM_NWNAME if [ "$HTTP_TYPE" = "HTTPS" ] then - mkdir "$SIM_GROUP"/tls/external - cp "$SIM_GROUP"/../certservice/generated-certs/dfc-p12/* "$SIM_GROUP"/tls/external/ docker run \ --name oom-certservice-post-processor \ --env-file "$SIM_GROUP"/../certservice/merger/merge-certs.env \ --mount type=bind,src="$SIM_GROUP"/tls,dst=/opt/app/datafile/etc/cert \ + --mount type=bind,src="$SIM_GROUP"/../certservice/generated-certs/dfc-p12,dst=/opt/app/datafile/etc/ \ nexus3.onap.org:10001/onap/org.onap.oom.platform.cert-service.oom-certservice-post-processor:latest fi docker run -d --volume $(pwd)/../simulator-group/tls/:/opt/app/datafile/etc/cert/ -p $localport":8100" -p $localport_secure":8433" --network=$DOCKER_SIM_NWNAME -e CONSUL_HOST=$CONSUL_HOST -e CONSUL_PORT=$CONSUL_PORT -e CONFIG_BINDING_SERVICE=$CONFIG_BINDING_SERVICE -e CONFIG_BINDING_SERVICE_SERVICE_PORT=$CONFIG_BINDING_SERVICE_SERVICE_PORT -e HOSTNAME=$appname --name $appname $DFC_IMAGE -- cgit 1.2.3-korg