diff options
author | 2020-04-22 20:51:50 +0200 | |
---|---|---|
committer | 2020-04-25 10:55:46 +0200 | |
commit | e8d81360e064faea0d6b011b0efc537035234527 (patch) | |
tree | 9157713dd248801f6166c74e3613419b558ca949 /docker/tempest/Dockerfile | |
parent | c934fa14bff8e74e5da03bb7ef75c0063e6e03a6 (diff) |
Use ujson version asked by OpenStack requirement
It's newer than the former tag selected [1].
[1] https://github.com/openstack/requirements/blob/master/upper-constraints.txt
Change-Id: Ie89136da364d7e972a1d7f49c71bdfbbdd9671d8
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 743235f280b675cab39adb15de8bcea215a1c038)
Diffstat (limited to 'docker/tempest/Dockerfile')
-rw-r--r-- | docker/tempest/Dockerfile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/docker/tempest/Dockerfile b/docker/tempest/Dockerfile index d5028de7c..7dcfa93cf 100644 --- a/docker/tempest/Dockerfile +++ b/docker/tempest/Dockerfile @@ -5,7 +5,6 @@ ARG OPENSTACK_TAG=stable/stein ARG TEMPEST_TAG=21.0.0 ARG RALLY_TAG=1.5.1 ARG RALLY_OPENSTACK_TAG=1.5.0 -ARG UJSON_TAG=d25e024f481c5571d15f3c0c406a498ca0467cfd COPY Accept-custom-registered-endpoints.patch /tmp/Accept-custom-registered-endpoints.patch COPY Fixes-race-condition-in-test_add_remove_fixed_ip.patch /tmp/Fixes-race-condition-in-test_add_remove_fixed_ip.patch @@ -14,7 +13,7 @@ RUN apk --no-cache add --virtual .build-deps --update \ openssl-dev libjpeg-turbo-dev && \ wget -q -O- https://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt > upper-constraints.txt && \ sed -i -E s/^tempest==+.*$/-e\ git+https:\\/\\/opendev.org\\/openstack\\/tempest@$TEMPEST_TAG#egg=tempest/ upper-constraints.txt && \ - sed -i -E s/^ujson==+.*$/-e\ git+https:\\/\\/github.com\\/esnme\\/ultrajson@$UJSON_TAG#egg=ujson/ upper-constraints.txt && \ + sed -i -E /^ujson==+.*$/d upper-constraints.txt && \ 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 && \ |