diff options
| -rw-r--r-- | docker/benchmarking/Dockerfile | 1 | ||||
| -rw-r--r-- | docker/core/Dockerfile | 1 | ||||
| -rw-r--r-- | docker/healthcheck/Dockerfile | 1 | ||||
| -rw-r--r-- | docker/tempest/Dockerfile | 1 | ||||
| -rw-r--r-- | docker/vnf/Dockerfile | 1 | ||||
| -rw-r--r-- | upper-constraints.txt | 1 |
6 files changed, 6 insertions, 0 deletions
diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile index 3550ae36b..1209019f5 100644 --- a/docker/benchmarking/Dockerfile +++ b/docker/benchmarking/Dockerfile @@ -12,6 +12,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 /#egg=tempest/d upper-constraints.txt && \ sed -i -E /^ujson==+.*$/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 f401d5530..d96abcb36 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -12,6 +12,7 @@ RUN apk --no-cache add --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 /^ujson==+.*$/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 && apk add --no-cache py-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/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile index 18c510e9e..61b17542c 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -9,6 +9,7 @@ ARG TEMPEST_HORIZON_TAG=0.1.0 COPY thirdparty-requirements.txt thirdparty-requirements.txt RUN 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 /^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/tempest/Dockerfile b/docker/tempest/Dockerfile index e268c435c..f3d9c03ec 100644 --- a/docker/tempest/Dockerfile +++ b/docker/tempest/Dockerfile @@ -15,6 +15,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 s/^tempest==+.*$/-e\ git+https:\\/\\/opendev.org\\/openstack\\/tempest@$TEMPEST_TAG#egg=tempest/ upper-constraints.txt && \ sed -i -E /^ujson==+.*$/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/vnf/Dockerfile b/docker/vnf/Dockerfile index 10e77c8fb..de7848d78 100644 --- a/docker/vnf/Dockerfile +++ b/docker/vnf/Dockerfile @@ -27,6 +27,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 /#egg=tempest/d upper-constraints.txt && \ sed -i -E /^ujson==+.*$/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/upper-constraints.txt b/upper-constraints.txt index 62b4b00f0..a071bd1b3 100644 --- a/upper-constraints.txt +++ b/upper-constraints.txt @@ -27,3 +27,4 @@ pylint===2.3.1;python_version=='3.6' sphinxcontrib-spelling===4.2.1 boto3===1.7.62 ujson===2.0.3 +kubernetes===10.0.0 |