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 09:47:41 +0200
commit381a70d86ce49bd55b298042dc11cb16f9710d82 (patch)
tree06bfc95cfc2c955d6eaef7d38104633768c4b2b5
parentd9a982a271b2afbdebe8af5d35830aedae44b20d (diff)
Set juju wait version
It's mandatory before releasing. Change-Id: Iac7b49fb1061b39ee6683e7b30f163cfc2060a95 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--docker/vnf/Dockerfile3
1 files changed, 2 insertions, 1 deletions
diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile
index 192c528ad..b7e562138 100644
--- a/docker/vnf/Dockerfile
+++ b/docker/vnf/Dockerfile
@@ -8,6 +8,7 @@ ARG CLOUDIFY_VIMS_TAG=fraser
ARG HEAT_VIMS_TAG=release-129
ARG VROUTER_TAG=fraser
ARG JUJU_TAG=tags/juju-2.2.5
+ARG JUJU_WAIT_TAG=2.6.4
ENV GOPATH /src/epc-requirements/go
ENV GOBIN /src/epc-requirements/go/bin
@@ -33,7 +34,7 @@ RUN apk --no-cache add --update \
git clone --depth 1 -b $VROUTER_TAG https://github.com/oolorg/opnfv-vnf-vyos-blueprint.git /src/opnfv-vnf-vyos-blueprint && \
git clone https://github.com/RebacaInc/abot_charm.git /src/epc-requirements/abot_charm && \
python3 -m pip install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \
- 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) && \