diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2020-06-04 10:14:06 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-06-06 10:16:27 +0200 |
| commit | 2691cbf1c608c3506c96b6cc78db012886d8d0c6 (patch) | |
| tree | db455ef7e5d1b22c0df399aab3c513dd201e08f5 /docker/tempest/Dockerfile | |
| parent | ece8163e0843fb1e21e84442c0359ae65874164b (diff) | |
Rename patch name and removes debug logs
The debug logs works only vs py3.8 and breaks backport to Iruya.
Change-Id: Ie91a8a876e263a83b6ae3fbfb5bb05644b87b970
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 39823fdbf534d05bfc3ddf4ddd5b8f8c3d603038)
Diffstat (limited to 'docker/tempest/Dockerfile')
| -rw-r--r-- | docker/tempest/Dockerfile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/docker/tempest/Dockerfile b/docker/tempest/Dockerfile index dc81774c5..e268c435c 100644 --- a/docker/tempest/Dockerfile +++ b/docker/tempest/Dockerfile @@ -8,6 +8,7 @@ ARG RALLY_OPENSTACK_TAG=1.5.0 COPY Accept-custom-registered-endpoints.patch /tmp/Accept-custom-registered-endpoints.patch COPY Fixes-race-condition-in-test_add_remove_fixed_ip.patch /tmp/Fixes-race-condition-in-test_add_remove_fixed_ip.patch +COPY Switch-to-threading.Thread-for-Rally-tasks.patch /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch RUN apk --no-cache add --virtual .build-deps --update \ python-dev build-base linux-headers libffi-dev \ openssl-dev libjpeg-turbo-dev && \ @@ -29,9 +30,11 @@ RUN apk --no-cache add --virtual .build-deps --update \ update-requirements -s --source /src/openstack-requirements /src/rally-openstack && \ pip install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \ tempest /src/rally-openstack && \ + (cd /src/rally && patch -p1 < /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch) && \ pip install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \ /src/rally && \ - rm -r upper-constraints.txt upper-constraints.opnfv.txt /src/rally /src/rally-openstack && \ + rm -r upper-constraints.txt upper-constraints.opnfv.txt /src/rally /src/rally-openstack \ + /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch && \ 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 && \ |