aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2021-04-20 14:30:56 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2021-04-20 14:32:46 +0200
commit336d8e9bbec0ee655ed1b736b41b1aae56538e53 (patch)
treea91340f7fe4785b7f51f2b56947705a6d64bb440
parentbbc398aff6cd05de709c1053fe9cf02c20b9de8b (diff)
Install setuptools_scm before xrallystable/iruya
Else upper-constraints basically fails. Change-Id: I022f101e2ed44708afd0b88d47b77d2f7ca85458 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 75170fc0b528c7e182b8164d5905fcbaa6957faa)
-rw-r--r--docker/core/Dockerfile4
1 files changed, 4 insertions, 0 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 317703f4..bc31f42a 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -19,6 +19,10 @@ RUN apk -U upgrade && \
pip3 install --no-cache-dir --src /src \
-chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$OPNFV_TAG \
-chttps://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt \
+ setuptools_scm && \
+ pip3 install --no-cache-dir --src /src \
+ -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.6/site-packages/rally && patch -p2 < /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch) && \
(cd /usr/lib/python3.6/site-packages/xrally_kubernetes/ && \