diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2020-11-22 12:09:12 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-11-22 13:03:02 +0100 |
| commit | 1a07d388cb13639fe8a4653ed92e30af30778ec7 (patch) | |
| tree | 0c726664f051495b209fcc6af5ee167a547a4476 /docker/core/Dockerfile | |
| parent | 1d39a04ad7e6948800b8943608b876b30092bc74 (diff) | |
Allow offline testing via xrally_kubernetes
It locally patches xrally_kubernetes before [1] is merged upstream.
It adds docker.io/appropriate/curl:edge in download_images.sh too.
[1] https://github.com/xrally/xrally-kubernetes/pull/51
Co-Authored-By: Tamas Lendvay <tamas.lendvay@nokia.com>
Change-Id: I82ea2c777cd4d8f24c38dbf32d66081846e3e9af
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit ea2715240015a482c5321d309257d801a412f02d)
Diffstat (limited to 'docker/core/Dockerfile')
| -rw-r--r-- | docker/core/Dockerfile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 069255ed..b7cbae78 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -6,6 +6,7 @@ ARG OPNFV_TAG=stable/hunter COPY Try-a-quick-fix-vs-asynchronuous-issues.patch /tmp/Try-a-quick-fix-vs-asynchronuous-issues.patch COPY Switch-to-threading.Thread-for-Rally-tasks.patch /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch +COPY Allow-offline-testing-in-PodWithClusterIPSvc.patch /tmp/Allow-offline-testing-in-PodWithClusterIPSvc.patch RUN apk --no-cache add --update python py-pip bash git grep libffi openssl mailcap && \ apk --no-cache add --virtual .build-deps --update \ python-dev build-base libffi-dev openssl-dev && \ @@ -19,14 +20,15 @@ RUN apk --no-cache add --update python py-pip bash git grep libffi openssl mailc /src/functest-kubernetes && \ (cd /usr/lib/python2.7/site-packages/rally && patch -p2 < /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch) && \ (cd /usr/lib/python2.7/site-packages/xrally_kubernetes/ && \ - patch -p2 < /tmp/Try-a-quick-fix-vs-asynchronuous-issues.patch) && \ + patch -p2 < /tmp/Try-a-quick-fix-vs-asynchronuous-issues.patch && \ + patch -p2 < /tmp/Allow-offline-testing-in-PodWithClusterIPSvc.patch) && \ rm -rf /src/functest-kubernetes /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch && \ bash -c "mkdir -p /var/lib/xtesting /home/opnfv" && \ ln -s /var/lib/xtesting /home/opnfv/functest && \ mkdir -p /etc/rally && \ printf "[database]\nconnection = 'sqlite:////var/lib/rally/database/rally.sqlite'" > /etc/rally/rally.conf && \ mkdir -p /var/lib/rally/database && rally db create && \ - rm /tmp/Try-a-quick-fix-vs-asynchronuous-issues.patch && \ + rm /tmp/Try-a-quick-fix-vs-asynchronuous-issues.patch /tmp/Allow-offline-testing-in-PodWithClusterIPSvc.patch && \ apk del .build-deps COPY logging.ini /usr/lib/python2.7/site-packages/xtesting/ci/logging.ini COPY logging.debug.ini /usr/lib/python2.7/site-packages/xtesting/ci/logging.debug.ini |