Merge "Install vEPC dependencies in Dockerfile"

2 files changed, 9 insertions, 17 deletions

diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile
index 6d96d98a..c52f6bc4 100644
--- a/docker/vnf/Dockerfile
+++ b/docker/vnf/Dockerfile
@@ -3,6 +3,11 @@ FROM opnfv/functest-core
 ARG BRANCH=master
 ARG OPENSTACK_TAG=stable/pike
 ARG VIMS_TAG=stable
+ARG JUJU_TAG=tags/juju-2.2.5
+
+ENV GOPATH /src/epc-requirements/go
+ENV GOBIN /src/epc-requirements/go/bin
+ENV PATH $GOBIN:$PATH
 
 RUN apk --no-cache add --update \
         ruby ruby-bundler ruby-irb ruby-rdoc dnsmasq \
@@ -18,6 +23,10 @@ RUN apk --no-cache add --update \
         -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
         juju-wait && \
     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) && \
+    go install -v github.com/juju/juju/... && \
+    rm -rf $GOPATH/go/src/ $GOPATH/pkg && \
     (cd /src/vims-test && bundle config build.nokogiri --use-system-libraries && bundle install --system) && \
     rm -r upper-constraints.txt /src/vims-test/.git /src/epc-requirements/abot_charm/.git && \
     apk del .build-deps
diff --git a/functest/opnfv_tests/vnf/epc/juju_epc.py b/functest/opnfv_tests/vnf/epc/juju_epc.py
index ada11c3a..e7743b3a 100644
--- a/functest/opnfv_tests/vnf/epc/juju_epc.py
+++ b/functest/opnfv_tests/vnf/epc/juju_epc.py
@@ -9,7 +9,6 @@
 """Juju testcase implementation."""
 
 import logging
-import shutil
 import os
 import time
 import json
@@ -203,22 +202,6 @@ class JujuEpc(vnf.VnfOnBoarding):
         self.__logger.info("Juju Bootstrap: Skip creation of flavors")
         flavor_creator.create()
         self.created_object.append(flavor_creator)
-        self.__logger.info("Installing Dependency Packages .......")
-        source_dir = "/src/epc-requirements/juju_bin_build"
-        if os.path.exists(source_dir):
-            shutil.rmtree(source_dir)
-        os.makedirs(source_dir)
-        os.environ['GOPATH'] = str(source_dir)
-        os.environ['GOBIN'] = str(source_dir) + "/bin"
-        os.environ['PATH'] = ((os.path.expandvars('$GOPATH')) + ":" +
-                              (os.path.expandvars('$GOBIN')) + ":" +
-                              (os.path.expandvars('$PATH')))
-        os.system('go get -d -v github.com/juju/juju/...')
-        os.chdir(source_dir + "/src" + "/github.com" + "/juju" + "/juju")
-        os.system('git checkout tags/juju-2.2.5')
-        os.system('go get github.com/rogpeppe/godeps')
-        os.system('godeps -u dependencies.tsv')
-        os.system('go install -v github.com/juju/juju/...')
         self.__logger.info("Creating Cloud for Abot-epc .....")
         os.system('juju add-cloud abot-epc -f {}'.format(self.filename))
         os.system('juju add-credential abot-epc -f {}'.format(self.filename))