aboutsummaryrefslogtreecommitdiffstats
path: root/docker/vnf/Dockerfile
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2020-02-17 13:06:40 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2020-02-17 13:07:34 +0100
commit1cf0c44ebaa5bbdcc25f14c4dfdcf55956db4b62 (patch)
tree590354b915ea6a51339c1aa968f9dcab24d08814 /docker/vnf/Dockerfile
parentf0e1bb2139be2f31b588069fd554b78944a2115b (diff)
Select OpenStack requirements master
https://github.com/openstack/requirements/commit/7a04f4e96205f16e74a9a08fe60b168c187516d6 Change-Id: I9ed510c45f63714b64dcb9fa90e4d7239f93ee3f Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker/vnf/Dockerfile')
-rw-r--r--docker/vnf/Dockerfile4
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile
index 92812c84f..dc5290de0 100644
--- a/docker/vnf/Dockerfile
+++ b/docker/vnf/Dockerfile
@@ -1,7 +1,7 @@
FROM opnfv/functest-core
ARG BRANCH=master
-ARG OPENSTACK_TAG=1843927ab31a6cc8b4313f786175da3ea2767a00
+ARG OPENSTACK_TAG=master
ARG VIMS_TEST_TAG=release-130
ARG QUAFF_TAG=59213d6d8ee29433552bb75f505cdc96b0b18909
ARG CLOUDIFY_VIMS_TAG=gambia
@@ -23,7 +23,7 @@ RUN apk --no-cache add --update \
procps libxslt libxml2 zlib libffi go musl-dev && \
apk --no-cache add --virtual .build-deps --update \
ruby-dev g++ make libxslt-dev libxml2-dev zlib-dev libffi-dev g++ make && \
- wget -q -O- https://opendev.org/openstack/requirements/raw/commit/$OPENSTACK_TAG/upper-constraints.txt > upper-constraints.txt && \
+ 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 && \
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 && \