X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fvnf%2FDockerfile;h=0b39b480e3625107d1070ea6fd632043d85b2945;hb=a4990a60c9b8e499e698fab28f9368816e50c6f7;hp=2e2ffefb73526b58f8b662df66a200cd374b857c;hpb=b039d8d4219bca73a5b86e03f34f27fbe655ec81;p=functest.git

diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile
index 2e2ffefb7..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
@@ -27,21 +28,39 @@ RUN apk --no-cache add --update \
         sed -E /#egg=functest/d > upper-constraints.opnfv.txt && \
     git clone --depth 1 -b $VIMS_TEST_TAG https://github.com/Metaswitch/clearwater-live-test /src/vims-test && \
     sed -i s/unf_ext\ \(.*\)/unf_ext\ \(0.0.7.4\)/g /src/vims-test/Gemfile.lock && \
-    git clone https://github.com/Metaswitch/quaff /src/vims-test/quaff && \
-    (cd /src/vims-test/quaff && git checkout $QUAFF_TAG) && \
-    git clone --depth 1 https://github.com/Metaswitch/clearwater-build-infra /src/vims-test/build-infra && \
-    (cd /src/vims-test/build-infra && git fetch --tags origin $VIMS_TEST_TAG && git checkout FETCH_HEAD) && \
-    git clone --depth 1 https://github.com/Orange-OpenSource/opnfv-cloudify-clearwater.git /src/cloudify_vims && \
-    (cd /src/cloudify_vims && git fetch --tags origin $CLOUDIFY_VIMS_TAG && git checkout FETCH_HEAD) && \
-    git clone --depth 1 https://github.com/Metaswitch/clearwater-heat.git /src/heat_vims && \
-    (cd /src/heat_vims && git fetch --tags origin $HEAT_VIMS_TAG && git checkout FETCH_HEAD) && \
-    git clone --depth 1 -b $VROUTER_TAG https://github.com/oolorg/opnfv-vnf-vyos-blueprint.git /src/opnfv-vnf-vyos-blueprint && \
-    (cd /src/opnfv-vnf-vyos-blueprint && git fetch --tags origin $VROUTER_TAG && git checkout FETCH_HEAD) && \
-    git clone --depth 1 https://github.com/RebacaInc/abot_charm.git /src/epc-requirements/abot_charm && \
-    (cd /src/epc-requirements/abot_charm && git fetch --tags origin $ABOT_CHARM && git checkout FETCH_HEAD) && \
+    git init /src/vims-test/quaff && \
+    (cd /src/vims-test/quaff && \
+        git fetch --tags https://github.com/Metaswitch/quaff $QUAFF_TAG && \
+        git checkout FETCH_HEAD) && \
+    git init /src/vims-test/build-infra && \
+    (cd /src/vims-test/build-infra && \
+        git fetch --tags https://github.com/Metaswitch/clearwater-build-infra $VIMS_TEST_TAG && \
+        git checkout FETCH_HEAD) && \
+    git init /src/cloudify_vims && \
+    (cd /src/cloudify_vims && \
+        git fetch --tags https://github.com/Orange-OpenSource/opnfv-cloudify-clearwater.git $CLOUDIFY_VIMS_TAG && \
+        git checkout FETCH_HEAD) && \
+    git init  /src/heat_vims && \
+    (cd /src/heat_vims && \
+        git fetch --tags https://github.com/Metaswitch/clearwater-heat.git $HEAT_VIMS_TAG && \
+        git checkout FETCH_HEAD) && \
+    git init /src/opnfv-vnf-vyos-blueprint && \
+    (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/... && \