aboutsummaryrefslogtreecommitdiffstats
path: root/docker/core/Dockerfile
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2020-04-30 13:50:57 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2020-04-30 16:13:02 +0200
commitcef8cbbad4ce0a3dce976f060c11db6198cc06ef (patch)
tree5f722d5a4508e78b3957598eee832fd2604dd013 /docker/core/Dockerfile
parentfb67fc715ac4dace0c1b217a683847fa54cad135 (diff)
Debug rally race conditions
It will be reverted as soon as the root cause is found. Change-Id: Icbff74c5fb940c1a201cbdc3fb2137c91e1ed460 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit dfa0f4d4a17e6985d3edc0ed5b9d56790fb2433d)
Diffstat (limited to 'docker/core/Dockerfile')
-rw-r--r--docker/core/Dockerfile5
1 files changed, 4 insertions, 1 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index ad408acd8..ed83723b6 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -5,6 +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
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 \
@@ -28,7 +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 && \
- rm -r upper-constraints.txt upper-constraints.opnfv.txt /src/functest && \
+ (cd /src/rally && patch -p1 < /tmp/Try-to-detect-the-race-conditions.patch) && \
+ rm -r upper-constraints.txt upper-constraints.opnfv.txt /src/functest \
+ /tmp/Try-to-detect-the-race-conditions.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" && \