X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fcore%2FDockerfile;h=e5481d0acadeeead75852ded773ab541cbfe930a;hb=0d9f8f379fa491ac148eb549400a74a74c8687d1;hp=a4f17498585a931276aff6115bf8174a9c3c5e82;hpb=397ef4366cb3067c1a25999eab0e928937cc6e04;p=functest.git

diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index a4f174985..e5481d0ac 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -3,9 +3,10 @@ FROM alpine:3.11
 ARG BRANCH=master
 ARG OPENSTACK_TAG=master
 
+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 mailcap && \
+        grep sed wget ca-certificates git openssh-client qemu-img iputils coreutils mailcap libstdc++ && \
     apk --no-cache add --virtual .build-deps --update \
         python3-dev build-base linux-headers libffi-dev \
         openssl-dev libjpeg-turbo-dev && \
@@ -14,7 +15,6 @@ RUN apk --no-cache add --update \
     wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH > upper-constraints.opnfv.txt  && \
     sed -i -E /#egg=functest/d upper-constraints.opnfv.txt && \
     sed -i -E /^tempest==+.*$/d upper-constraints.txt && \
-    sed -i -E s/^ujson==+.*$/-e\ git+https:\\/\\/github.com\\/esnme\\/ultrajson@$UJSON_TAG#egg=ujson/ upper-constraints.txt && \
     pip3 install --no-cache-dir --src /src -cupper-constraints.opnfv.txt -cupper-constraints.txt \
         -e git+https://opendev.org/openstack/requirements@$OPENSTACK_TAG#egg=openstack_requirements && \
     git init /src/functest && \
@@ -24,7 +24,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.8/site-packages/functest/ci/logging.ini /usr/lib/python3.8/site-packages/xtesting/ci/ && \
     cp /usr/lib/python3.8/site-packages/functest/ci/logging.debug.ini /usr/lib/python3.8/site-packages/xtesting/ci/ && \
     bash -c "mkdir -p /var/lib/xtesting /home/opnfv" && \