diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2020-05-05 23:43:23 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-07-06 13:00:50 +0200 |
| commit | 6ae8eed0339b8381f627f95905cd41464fe79796 (patch) | |
| tree | 8fa466aa5540b02826d8f069bc4e5644de3ba19b /docker/core/Dockerfile | |
| parent | a0a241e0c1dd0f76aa09b2680f5bb6a8453e18d5 (diff) | |
Try a quick fix vs the race conditions in xrally
Change-Id: I57a4c317ba365586c10b13d425aac021dd030949
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 81139b1576981990f32df76719f179441e4d12ee)
(cherry picked from commit 2a2744f1e612a1ed0a38cadd2b49100613da70d6)
Diffstat (limited to 'docker/core/Dockerfile')
| -rw-r--r-- | docker/core/Dockerfile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 9585d903..447ca97f 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -4,6 +4,7 @@ ARG BRANCH=stable/hunter ARG OPENSTACK_TAG=stable/rocky ARG OPNFV_TAG=stable/hunter +COPY Try-a-quick-fix-vs-asynchronuous-issues.patch /tmp/Try-a-quick-fix-vs-asynchronuous-issues.patch RUN apk --no-cache add --update python py-pip bash git grep libffi openssl mailcap && \ apk --no-cache add --virtual .build-deps --update \ python-dev build-base libffi-dev openssl-dev && \ @@ -15,12 +16,15 @@ RUN apk --no-cache add --update python py-pip bash git grep libffi openssl mailc -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/python2.7/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/python2.7/site-packages/xtesting/ci/logging.ini CMD ["run_tests", "-t", "all"] |