diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2020-06-08 10:16:32 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-07-06 13:02:06 +0200 |
| commit | b8af9967abe114bc82550fa66140291cca4c0afc (patch) | |
| tree | b8b267c838ecf7c6ee27a5f386ad9586a2577602 /docker/core/Dockerfile | |
| parent | 6ae8eed0339b8381f627f95905cd41464fe79796 (diff) | |
Apply Rally patch (switch to threading for tasks)
Change-Id: I8f4df2d4c220edc538c743cccce8050efe4a1140
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit bfd0063c81f5d5d4fad2389832c8f1479a28f73d)
(cherry picked from commit fbac166c0010ac15835ba37260b94e3c705e339d)
Diffstat (limited to 'docker/core/Dockerfile')
| -rw-r--r-- | docker/core/Dockerfile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 447ca97f..8518686b 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -5,6 +5,7 @@ ARG OPENSTACK_TAG=stable/rocky 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 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 && \ @@ -16,9 +17,10 @@ RUN apk --no-cache add --update python py-pip bash git grep libffi openssl mailc -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$OPNFV_TAG \ -chttps://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt \ /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) && \ - rm -rf /src/functest-kubernetes && \ + 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 && \ |