Update ujson (Alpine 3.9)

ujson v1.35 can't work vs Alpine 3.9 [1].
upper-constraints are overriden to include the patch needed [2].

It fixes rally testcases (gnocchi).

[1] https://github.com/esnme/ultrajson/issues/326
[2] https://github.com/esnme/ultrajson/commit/d25e024f481c5571d15f3c0c406a498ca0467cfd

Change-Id: Iac9975b0669d5975c63d76ddefb64058e5183369
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit c6eb6eca4bb1919c8c943cf534b3e9c935e73118)

diff --git a/docker/tempest/Dockerfile b/docker/tempest/Dockerfile
index b5044f8..87793cd 100644 (file)
--- a/docker/tempest/Dockerfile
+++ b/docker/tempest/Dockerfile
@@ -6,12 +6,14 @@ ARG TEMPEST_TAG=3588bb3f5ef546a0ef4d4ad621fd1be381b5fdaf
 ARG RALLY_TAG=1.3.0
 ARG RALLY_OPENSTACK_TAG=1.3.0
 ARG OS_FAULTS_TAG=0.1.18
+ARG UJSON_TAG=d25e024f481c5571d15f3c0c406a498ca0467cfd
 
 RUN apk --no-cache add --virtual .build-deps --update \
         python-dev build-base linux-headers libffi-dev \
         openssl-dev libjpeg-turbo-dev && \
     wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG > upper-constraints.txt && \
     sed -i -E s/^tempest==+.*$/-e\ git+https:\\/\\/git.openstack.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 && \
     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 && \
     git init /src/os-faults && \