X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fvnf%2FDockerfile;h=afaec2320d882dc52898d0b95775a189195bcac2;hb=924650dd52ffdb01e9da18aaf545c08ab237f16e;hp=36e80d7e26683781102e2424f574d16d15b94db5;hpb=843fbe920471eff37f7acccb4f56bd603bfe22ba;p=functest.git

diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile
index 36e80d7e2..afaec2320 100644
--- a/docker/vnf/Dockerfile
+++ b/docker/vnf/Dockerfile
@@ -1,15 +1,34 @@
 FROM opnfv/functest-core
 
+ARG BRANCH=master
+ARG OPENSTACK_TAG=stable/queens
 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 \
-        procps libxslt libxml2 zlib libffi && \
+        procps libxslt libxml2 zlib libffi python3 go musl-dev && \
     apk --no-cache add --virtual .build-deps --update \
         ruby-dev g++ make libxslt-dev libxml2-dev zlib-dev libffi-dev && \
+    wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG | \
+        sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ | \
+        > upper-constraints.txt && \
     git clone --depth 1 -b $VIMS_TAG https://github.com/boucherv-orange/clearwater-live-test /src/vims-test && \
-    rm -r /src/vims-test/.git && \
-    cd /src/vims-test && bundle config build.nokogiri --use-system-libraries && bundle install --system && \
+    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 \
+        -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
-COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml
-CMD ["bash","-c","prepare_env start && run_tests -t all"]
+COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml
+CMD ["run_tests", "-t", "all"]