Add HTTPS to DFC tests

- CSIT tests are unable to run due to some Docker error.
  this patch should fix this + one another fix

Issue-ID: DCAEGEN2-2528
Signed-off-by: Krzysztof Gajewski <krzysztof.gajewski@nokia.com>
Change-Id: Iee95075b701e9b4fe9b0ed3b0d4ee232121a043e

diff --git a/test/mocks/datafilecollector-testharness/http-https-server/Dockerfile-http-https b/test/mocks/datafilecollector-testharness/http-https-server/Dockerfile-http-https
index a2d8bf8..754d01a 100644 (file)
--- a/test/mocks/datafilecollector-testharness/http-https-server/Dockerfile-http-https
+++ b/test/mocks/datafilecollector-testharness/http-https-server/Dockerfile-http-https
@@ -4,12 +4,12 @@ RUN apk update
 
 ENV APACHE_LOG_DIR /usr/local/apache2/logs
 
-RUN mkdir /usr/local/apache2/certs
-
-COPY --chown=root:root apache2/certs /usr/local/apache2/certs
 COPY --chown=root:root apache2/conf /usr/local/apache2/conf
 COPY --chown=root:root apache2/conf/extra /usr/local/apache2/conf/extra
 
 RUN chmod 644 /usr/local/apache2/conf/.htpasswd
 RUN chmod 644 /usr/local/apache2/conf/httpd.conf
 RUN chmod 644 /usr/local/apache2/conf/extra/httpd-ssl.conf
+
+RUN mkdir /usr/local/apache2/certs
+COPY --chown=root:root apache2/certs /usr/local/apache2/certs

diff --git a/test/mocks/datafilecollector-testharness/simulator-group/simulators-kill.sh b/test/mocks/datafilecollector-testharness/simulator-group/simulators-kill.sh
index e534943..9f0fb21 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/simulator-group/simulators-kill.sh
+++ b/test/mocks/datafilecollector-testharness/simulator-group/simulators-kill.sh
@@ -25,12 +25,11 @@ docker kill dfc_ftpes-server-vsftpd1
 docker kill dfc_ftpes-server-vsftpd2
 docker kill dfc_ftpes-server-vsftpd3
 docker kill dfc_ftpes-server-vsftpd4
-docker kill dfc_http-server0
-docker kill dfc_http-server1
-docker kill dfc_http-server2
-docker kill dfc_http-server3
-docker kill dfc_http-server4
-docker kill oom-certservice-post-processor
+docker kill dfc_http-https-server0
+docker kill dfc_http-https-server1
+docker kill dfc_http-https-server2
+docker kill dfc_http-https-server3
+docker kill dfc_http-https-server4
 docker kill dfc_cbs
 docker kill dfc_consul