summaryrefslogtreecommitdiffstats
path: root/docker/vnf
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2019-03-28 22:34:42 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2019-03-30 14:00:16 +0100
commit49f7d350cddee35807524f65b0699122fabf0e47 (patch)
tree843688b6058606c8a0efe0e242f0b49c9e08aeff /docker/vnf
parent801d3da26f3de1ccc0b3807110c8b797fcfb678c (diff)
Set package versions instead of master
It leverages on few beta releases as the official packages are being published. Tempest 20.0.0 is forced to conform with Release Plan [1]. (upper-constraints still offer 19.0.0 [2]) [1] https://releases.openstack.org/stein/ [2] https://github.com/openstack/requirements/blob/stable/stein/upper-constraints.txt#L391 Change-Id: Iaadf5bbc3b984e95cd018ac69bb9efb4eb111df9 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker/vnf')
-rw-r--r--docker/vnf/Dockerfile3
1 files changed, 2 insertions, 1 deletions
diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile
index a76ce1554..3e44ca143 100644
--- a/docker/vnf/Dockerfile
+++ b/docker/vnf/Dockerfile
@@ -2,6 +2,7 @@ FROM opnfv/functest-core:iruya
ARG BRANCH=stable/iruya
ARG OPENSTACK_TAG=stable/stein
+ARG TEMPEST_TAG=20.0.0
ARG VIMS_TEST_TAG=release-130
ARG QUAFF_TAG=59213d6d8ee29433552bb75f505cdc96b0b18909
ARG CLOUDIFY_VIMS_TAG=gambia
@@ -24,7 +25,7 @@ RUN apk --no-cache add --update \
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://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG > upper-constraints.txt && \
- sed -i -E s/^tempest==+.*$/-e\ git+https:\\/\\/git.openstack.org\\/openstack\\/tempest#egg=tempest/ upper-constraints.txt && \
+ sed -i -E s/^tempest==+.*$/-e\ git+https:\\/\\/git.openstack.org\\/openstack\\/tempest@$TEMPEST_TAG#egg=tempest/ upper-constraints.txt && \
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 && \
git clone --depth 1 -b $VIMS_TEST_TAG https://github.com/Metaswitch/clearwater-live-test /src/vims-test && \