diff options
| author |   Krzysztof Gajewski <krzysztof.gajewski@nokia.com> | 2021-02-15 13:54:28 +0100 |
|---|---|---|
| committer | Krzysztof Gajewski <krzysztof.gajewski@nokia.com> | 2021-02-15 13:54:28 +0100 |
| commit | 1e366898551d71168ce47747243377e29e6b989e (patch) | |
| tree | 3dbfbc68d6574030e7a0d97040d65f4d25ccca5b | |
| parent | c746882a07952a0cd460e6fa8bcac246289db6b9 (diff) | |
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
| -rw-r--r-- | test/mocks/datafilecollector-testharness/http-https-server/Dockerfile-http-https | 6 | ||||
| -rwxr-xr-x | test/mocks/datafilecollector-testharness/simulator-group/simulators-kill.sh | 11 |
2 files changed, 8 insertions, 9 deletions
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 a2d8bf8cc..754d01af0 100644 --- 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 e53494392..9f0fb2138 100755 --- 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 |