From 0ca6df5099fd237ebd21cec31ff6db0733e0ac95 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Sat, 25 Aug 2018 11:58:42 +0200 Subject: Set juju wait version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's mandatory before releasing. Change-Id: Iac7b49fb1061b39ee6683e7b30f163cfc2060a95 Signed-off-by: Cédric Ollivier (cherry picked from commit 381a70d86ce49bd55b298042dc11cb16f9710d82) --- docker/vnf/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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) && \ -- cgit 1.2.3-korg