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-04 10:21:20 +0200 |
| commit | b30b41bf9c5342102eb13c538b2c54f55bf0e197 (patch) | |
| tree | 53f2504ba77b71a0c7137e9e233a66e9afe7e153 /docker/core/Dockerfile | |
| parent | 92418f1ff2727d8ac2213b662cc836d31992f567 (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/core/Dockerfile')
| -rw-r--r-- | docker/core/Dockerfile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index ed83723b6..0e09385b0 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -5,7 +5,7 @@ ARG OPENSTACK_TAG=stable/train 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 Try-to-detect-the-race-conditions.patch /tmp/Try-to-detect-the-race-conditions.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 libffi openssl libjpeg-turbo py3-pip bash \ grep sed wget ca-certificates git openssh-client qemu-img iputils coreutils mailcap \ @@ -29,9 +29,9 @@ RUN apk --no-cache add --update \ update-requirements -s --source /src/openstack-requirements /src/functest && \ pip3 install --no-cache-dir --src /src -cupper-constraints.opnfv.txt -cupper-constraints.txt \ /src/functest && \ - (cd /src/rally && patch -p1 < /tmp/Try-to-detect-the-race-conditions.patch) && \ + (cd /src/rally && patch -p1 < /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch) && \ rm -r upper-constraints.txt upper-constraints.opnfv.txt /src/functest \ - /tmp/Try-to-detect-the-race-conditions.patch && \ + /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch && \ cp /usr/lib/python3.7/site-packages/functest/ci/logging.ini /usr/lib/python3.7/site-packages/xtesting/ci/ && \ cp /usr/lib/python3.7/site-packages/functest/ci/logging.debug.ini /usr/lib/python3.7/site-packages/xtesting/ci/ && \ bash -c "mkdir -p /var/lib/xtesting /home/opnfv" && \ |