From 81139b1576981990f32df76719f179441e4d12ee Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Tue, 5 May 2020 23:43:23 +0200 Subject: Try a quick fix vs the race conditions in xrally MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I57a4c317ba365586c10b13d425aac021dd030949 Signed-off-by: Cédric Ollivier --- docker/core/Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'docker/core/Dockerfile') diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 7c468040..2f1723d4 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -4,6 +4,7 @@ ARG BRANCH=master 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 RUN apk --no-cache add --update python3 bash git grep libffi openssl mailcap && \ apk --no-cache add --virtual .build-deps --update \ python3-dev build-base libffi-dev openssl-dev && \ @@ -15,12 +16,15 @@ RUN apk --no-cache add --update python3 bash git grep libffi openssl mailcap && -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 /usr/lib/python3.8/site-packages/xrally_kubernetes/ && \ + patch -p2 < /tmp/Try-a-quick-fix-vs-asynchronuous-issues.patch) && \ rm -rf /src/functest-kubernetes && \ bash -c "mkdir -p /var/lib/xtesting /home/opnfv" && \ ln -s /var/lib/xtesting /home/opnfv/functest && \ 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 && \ + rm /tmp/Try-a-quick-fix-vs-asynchronuous-issues.patch && \ apk del .build-deps COPY logging.ini /usr/lib/python3.8/site-packages/xtesting/ci/logging.ini COPY logging.debug.ini /usr/lib/python3.8/site-packages/xtesting/ci/logging.debug.ini -- cgit 1.2.3-korg