diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2020-11-10 14:49:05 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-11-11 10:36:03 +0100 |
| commit | 4274cbe577af6c0ed57239a9a3f47741eb6292f5 (patch) | |
| tree | c16f639071c4559c7bfe3cf23997cbcd376d5513 /docker/tempest/Dockerfile | |
| parent | a391e4fc89a3aebf9f94c2af35bfbf0f5c1793d1 (diff) | |
Add rally and xrally_kubernetes in upper-constraints.txt
It's needed by functest_kubernetes.
Change-Id: I2ebd730a1d9f84a63026e8cf03cf27367d0bcfde
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit aafe5a1be9b2d2cdf114477329b902767af23006)
Diffstat (limited to 'docker/tempest/Dockerfile')
| -rw-r--r-- | docker/tempest/Dockerfile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/docker/tempest/Dockerfile b/docker/tempest/Dockerfile index 285d472dd..2298c4d0b 100644 --- a/docker/tempest/Dockerfile +++ b/docker/tempest/Dockerfile @@ -21,11 +21,16 @@ RUN apk --no-cache add --virtual .build-deps --update \ case $(uname -m) in aarch*|arm*) sed -i -E /^PyNaCl=/d upper-constraints.txt ;; esac && \ 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 /#egg=rally/d upper-constraints.opnfv.txt && \ + sed -i -E /#egg=xrally-kubernetes/d upper-constraints.opnfv.txt && \ git init /src/rally && \ (cd /src/rally && \ git fetch --tags https://opendev.org/openstack/rally.git $RALLY_TAG && \ git checkout FETCH_HEAD) && \ update-requirements -s --source /src/openstack-requirements /src/rally/ && \ + (cd /src/rally && patch -p1 < /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch) && \ + pip install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \ + /src/rally && \ git init /src/rally-openstack && \ (cd /src/rally-openstack && \ git fetch --tags https://opendev.org/openstack/rally-openstack.git $RALLY_OPENSTACK_TAG && \ @@ -33,9 +38,6 @@ RUN apk --no-cache add --virtual .build-deps --update \ update-requirements -s --source /src/openstack-requirements /src/rally-openstack && \ pip install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \ tempest /src/rally-openstack && \ - (cd /src/rally && patch -p1 < /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch) && \ - pip install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \ - /src/rally && \ rm -r upper-constraints.txt upper-constraints.opnfv.txt /src/rally /src/rally-openstack \ /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch && \ mkdir -p /etc/rally && \ |