diff options
| author |   Juha Kosonen <juha.kosonen@nokia.com> | 2020-04-07 12:32:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2020-04-07 12:32:14 +0000 |
| commit | 7a4999192aa82be41323888deabf1613fccb7305 (patch) | |
| tree | bc18e9be34233dbb27b0a0b16640ca5634a68dac /docker/vnf | |
| parent | 792024f8340d70abf2962dbee6c67d803b6e7681 (diff) | |
| parent | 47bd9143d2ef8d32cee01b8f288c04d52c1fe2a2 (diff) | |
Merge "Update rally (3.0.0) and rally-openstack" into stable/jerma
Diffstat (limited to 'docker/vnf')
| -rw-r--r-- | docker/vnf/Dockerfile | 1 |
1 files changed, 1 insertions, 0 deletions
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 && \ |