aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorJuha Kosonen <juha.kosonen@nokia.com>2020-04-07 12:32:14 +0000
committerGerrit Code Review <gerrit@opnfv.org>2020-04-07 12:32:14 +0000
commit7a4999192aa82be41323888deabf1613fccb7305 (patch)
treebc18e9be34233dbb27b0a0b16640ca5634a68dac /docker
parent792024f8340d70abf2962dbee6c67d803b6e7681 (diff)
parent47bd9143d2ef8d32cee01b8f288c04d52c1fe2a2 (diff)
Merge "Update rally (3.0.0) and rally-openstack" into stable/jerma
Diffstat (limited to 'docker')
-rw-r--r--docker/benchmarking/Dockerfile1
-rw-r--r--docker/core/Dockerfile1
-rw-r--r--docker/healthcheck/Dockerfile1
-rw-r--r--docker/smoke/Dockerfile1
-rw-r--r--docker/vnf/Dockerfile1
5 files changed, 5 insertions, 0 deletions
diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile
index e9b2cd954..af900086a 100644
--- a/docker/benchmarking/Dockerfile
+++ b/docker/benchmarking/Dockerfile
@@ -10,6 +10,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 /^kubernetes==+.*$/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 5359ca021..9415c1270 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -15,6 +15,7 @@ RUN apk --no-cache add --update \
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 /^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 && \
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 && \
diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile
index 77ba3f7b0..c52e2fd69 100644
--- a/docker/healthcheck/Dockerfile
+++ b/docker/healthcheck/Dockerfile
@@ -10,6 +10,7 @@ RUN apk --no-cache add --virtual .build-deps --update \
python3-dev build-base linux-headers libffi-dev openssl-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 /^kubernetes==+.*$/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 23af2d896..f8f0c41b2 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -16,6 +16,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 /^kubernetes==+.*$/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 ee8660fbf..29dd41ed1 100644
--- a/docker/vnf/Dockerfile
+++ b/docker/vnf/Dockerfile
@@ -25,6 +25,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 /^tempest==+.*$/d upper-constraints.txt && \
+ sed -i -E /^kubernetes==+.*$/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 && \