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-06-08 10:16:32 +0200 |
| commit | bfd0063c81f5d5d4fad2389832c8f1479a28f73d (patch) | |
| tree | 45ae36fc93f8350fd310f2be1edcbacba7aba040 /docker/core/Dockerfile | |
| parent | 992606d988814e9fdda83fd0398941037c8e3ae6 (diff) | |
Apply Rally patch (switch to threading for tasks)
Change-Id: I8f4df2d4c220edc538c743cccce8050efe4a1140
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
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 11bcc16c..0d461e3d 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -5,6 +5,7 @@ ARG OPENSTACK_TAG=master ARG OPNFV_TAG=master 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 python3 py3-pip bash git grep libffi openssl mailcap && \ apk --no-cache add --virtual .build-deps --update \ python3-dev build-base libffi-dev openssl-dev && \ @@ -12,13 +13,14 @@ RUN apk --no-cache add --update python3 py3-pip bash git grep libffi openssl mai (cd /src/functest-kubernetes && \ git fetch --tags https://gerrit.opnfv.org/gerrit/functest-kubernetes $BRANCH && \ git checkout FETCH_HEAD) && \ - pip3 install \ + pip3 install --no-cache-dir --src /src \ -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 /src/rally && patch -p1 < /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch) && \ (cd /usr/lib/python3.8/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 && \ |