diff options
Diffstat (limited to 'docker/vnf')
| -rw-r--r-- | docker/vnf/Dockerfile | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile index d081ff17f..0b39b480e 100644 --- a/docker/vnf/Dockerfile +++ b/docker/vnf/Dockerfile @@ -1,15 +1,16 @@ FROM opnfv/functest-core ARG BRANCH=master -ARG OPENSTACK_TAG=stable/queens +ARG OPENSTACK_TAG=master ARG VIMS_TEST_TAG=release-129 ARG QUAFF_TAG=59213d6d8ee29433552bb75f505cdc96b0b18909 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_TAG=tags/juju-2.3.9 ARG JUJU_WAIT_TAG=2.6.4 ARG ABOT_CHARM=opnfv-fraser +ARG GODEPS_TAG=404a7e748cd352bb0d7449dedc645546eebbfc6e ENV GOPATH /src/epc-requirements/go ENV GOBIN /src/epc-requirements/go/bin @@ -47,13 +48,19 @@ RUN apk --no-cache add --update \ (cd /src/opnfv-vnf-vyos-blueprint && \ git fetch --tags https://github.com/oolorg/opnfv-vnf-vyos-blueprint.git $VROUTER_TAG && \ git checkout FETCH_HEAD) && \ + mkdir -p /home/opnfv/functest/data/router && \ + git init /home/opnfv/functest/data/router/opnfv-vnf-data && \ + (cd /home/opnfv/functest/data/router/opnfv-vnf-data && \ + git fetch --tags https://github.com/oolorg/opnfv-vnf-data.git $VROUTER_TAG && \ + git checkout FETCH_HEAD) && \ git init /src/epc-requirements/abot_charm && \ (cd /src/epc-requirements/abot_charm && \ git fetch --tags https://github.com/RebacaInc/abot_charm.git $ABOT_CHARM && \ git checkout FETCH_HEAD) && \ python3 -m pip install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \ juju-wait==$JUJU_WAIT_TAG && \ - go get github.com/rogpeppe/godeps && \ + go get -d github.com/rogpeppe/godeps && \ + (cd $GOPATH/src/github.com/rogpeppe/godeps && git checkout $GODEPS_TAG && go install -v 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) && \ go install -v github.com/juju/juju/... && \ |