summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-08-25 11:58:42 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2018-08-26 12:15:28 +0200
commit0ca6df5099fd237ebd21cec31ff6db0733e0ac95 (patch)
treec7d8042396493b8e6f9a6d3e87a7c62d1ea8d9a4
parent5f0e8e4aba409982c03d7fbd38115f0beeceb75b (diff)
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)
-rw-r--r--docker/vnf/Dockerfile3
1 files changed, 2 insertions, 1 deletions
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) && \