aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2020-04-22 20:51:50 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2020-04-25 10:55:46 +0200
commite8d81360e064faea0d6b011b0efc537035234527 (patch)
tree9157713dd248801f6166c74e3613419b558ca949
parentc934fa14bff8e74e5da03bb7ef75c0063e6e03a6 (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)
-rw-r--r--docker/benchmarking/Dockerfile1
-rw-r--r--docker/core/Dockerfile4
-rw-r--r--docker/smoke/Dockerfile1
-rw-r--r--docker/tempest/Dockerfile3
-rw-r--r--docker/vnf/Dockerfile1
-rw-r--r--upper-constraints.txt1
6 files changed, 8 insertions, 3 deletions
diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile
index 2ad63fbd0..eab857d2a 100644
--- a/docker/benchmarking/Dockerfile
+++ b/docker/benchmarking/Dockerfile
@@ -11,6 +11,7 @@ RUN apk --no-cache add --update libxml2 libxslt && \
openssl-dev libjpeg-turbo-dev libxml2-dev libxslt-dev && \
wget -q -O- https://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt > upper-constraints.txt && \
sed -i -E /#egg=tempest/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 583c46cec..9347021d6 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -5,11 +5,13 @@ ARG OPENSTACK_TAG=stable/stein
RUN apk --no-cache add --update \
python3 libffi openssl libjpeg-turbo py3-pip bash \
- grep sed wget ca-certificates git openssh-client qemu-img iputils coreutils mailcap && \
+ grep sed wget ca-certificates git openssh-client qemu-img iputils coreutils mailcap \
+ libstdc++ && \
apk --no-cache add --virtual .build-deps --update \
python3-dev build-base linux-headers libffi-dev \
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 /^ujson==+.*$/d upper-constraints.txt && \
case $(uname -m) in aarch*|arm*) sed -i -E /^PyNaCl=/d upper-constraints.txt && apk add --no-cache py3-pynacl ;; 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 de50fb59f..f4e92e350 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -18,6 +18,7 @@ RUN apk --no-cache add --update libxml2 libxslt && \
openssl-dev libjpeg-turbo-dev libxml2-dev libxslt-dev && \
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 /^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/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 && \
diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile
index a7dcbac7d..828afb5af 100644
--- a/docker/vnf/Dockerfile
+++ b/docker/vnf/Dockerfile
@@ -26,6 +26,7 @@ RUN apk --no-cache add --update \
ruby-dev g++ make libxslt-dev libxml2-dev zlib-dev libffi-dev && \
wget -q -O- https://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt > upper-constraints.txt && \
sed -i -E /#egg=tempest/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 ad8f18c47..2b5272cff 100644
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -26,3 +26,4 @@ pylint===1.9.5;python_version=='2.7'
pylint===2.3.1;python_version=='3.6'
sphinx===1.7.6
sphinxcontrib-spelling===4.2.1
+ujson===2.0.3