From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Sat, 25 Aug 2018 09:58:42 +0000 (+0200)
Subject: Set juju wait version
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F91%2F61391%2F1;p=functest.git

Set juju wait version

It's mandatory before releasing.

Change-Id: Iac7b49fb1061b39ee6683e7b30f163cfc2060a95
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 381a70d86ce49bd55b298042dc11cb16f9710d82)
---

diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile
index 27c129725..b17ad2b9e 100644
--- a/docker/vnf/Dockerfile
+++ b/docker/vnf/Dockerfile
@@ -8,6 +8,7 @@ ARG CLOUDIFY_VIMS_TAG=fraser
 ARG VROUTER_TAG=fraser
 ARG JUJU_TAG=tags/juju-2.2.5
 ARG ABOT_TAG=opnfv-fraser
+ARG JUJU_WAIT_TAG=2.6.4
 
 ENV GOPATH /src/epc-requirements/go
 ENV GOBIN /src/epc-requirements/go/bin
@@ -32,7 +33,7 @@ RUN apk --no-cache add --update \
     (cd /src/epc-requirements/abot_charm && git checkout $ABOT_TAG) && \
     python3 -m pip install --no-cache-dir --src /src -cupper-constraints.txt \
         -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
-        juju-wait && \
+        juju-wait==$JUJU_WAIT_TAG && \
     go get github.com/rogpeppe/godeps && \
     go get -d -v github.com/juju/juju/... || true && \
     (cd $GOPATH/src/github.com/juju/juju && git checkout $JUJU_TAG && godeps -u dependencies.tsv) && \