Use ujson version asked by OpenStack master requirement

It's newer than the former tag selected [1].
The version asks by OpenStack train and older cannot work vs Alpine.

ImportError: Error relocating /usr/lib/python3.7/site-packages/ujson.cpython-37m-x86_64-linux-gnu.so: strreverse: symbol not found

[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)

diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile
index af90008..aaef509 100644 (file)
--- a/docker/benchmarking/Dockerfile
+++ b/docker/benchmarking/Dockerfile
@@ -11,6 +11,7 @@ RUN apk --no-cache add --update libxml2 libxslt && \
     wget -q -O- https://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt > upper-constraints.txt && \
     sed -i -E /^tempest==+.*$/d upper-constraints.txt && \
     sed -i -E /^kubernetes==+.*$/d 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 && \

diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 6c8165a..4b873bd 100644 (file)
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -17,7 +17,7 @@ RUN apk --no-cache add --update \
     sed -i -E /#egg=functest/d upper-constraints.opnfv.txt && \
     sed -i -E /^tempest==+.*$/d upper-constraints.txt && \
     sed -i -E /^kubernetes==+.*$/d 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 && \
     pip3 install --no-cache-dir --src /src -cupper-constraints.opnfv.txt -cupper-constraints.txt \
         -e git+https://opendev.org/openstack/requirements@$OPENSTACK_TAG#egg=openstack_requirements && \
     git init /src/functest && \

diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile
index c52e2fd..2a20441 100644 (file)
--- a/docker/healthcheck/Dockerfile
+++ b/docker/healthcheck/Dockerfile
@@ -11,6 +11,7 @@ RUN apk --no-cache add --virtual .build-deps --update \
     wget -q -O- https://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt > upper-constraints.txt && \
     sed -i -E /^tempest==+.*$/d upper-constraints.txt && \
     sed -i -E /^kubernetes==+.*$/d 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 && \

diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index c390ab5..8fc7ec9 100644 (file)
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -18,6 +18,7 @@ RUN apk --no-cache add --update libxml2 libxslt && \
     wget -q -O- https://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt > upper-constraints.txt && \
     sed -i -E /^tempest==+.*$/d upper-constraints.txt && \
     sed -i -E /^kubernetes==+.*$/d upper-constraints.txt && \
+    sed -i -E /^ujson==+.*$/d upper-constraints.txt && \
     sed -i -E /^neutron==+.*$/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 && \

diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile
index 29dd41e..4b20efc 100644 (file)
--- a/docker/vnf/Dockerfile
+++ b/docker/vnf/Dockerfile
@@ -26,6 +26,7 @@ RUN apk --no-cache add --update \
     wget -q -O- https://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt > upper-constraints.txt && \
     sed -i -E /^tempest==+.*$/d upper-constraints.txt && \
     sed -i -E /^kubernetes==+.*$/d 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 && \

diff --git a/upper-constraints.txt b/upper-constraints.txt
index d4a584b..8119675 100644 (file)
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -22,7 +22,7 @@ ruamel.yaml.jinja2==0.2.2
 rally.git===3.0.0
 git+https://opendev.org/openstack/rally-openstack.git@83eae7f02ac1e15c0e2a6a35978abeb1f8b2cd3f#egg=rally-openstack
 git+https://github.com/xrally/xrally-kubernetes.git@e4c605fa0ae0cae63ce5ac19ce8516f0bdd5e868#egg=xrally-kubernetes
-git+https://github.com/esnme/ultrajson@d25e024f481c5571d15f3c0c406a498ca0467cfd#egg=ujson
+ujson===2.0.3
 pylint===1.9.5;python_version=='2.7'
 pylint===2.3.1;python_version=='3.7'
 ruamel.yaml===0.15.100