Code Review
/
functest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Disable volume in Patrole 0.3 by default
[functest.git]
/
docker
/
vnf
/
Dockerfile
diff --git
a/docker/vnf/Dockerfile
b/docker/vnf/Dockerfile
index
6d96d98
..
afaec23
100644
(file)
--- a/
docker/vnf/Dockerfile
+++ b/
docker/vnf/Dockerfile
@@
-1,8
+1,13
@@
FROM opnfv/functest-core
ARG BRANCH=master
FROM opnfv/functest-core
ARG BRANCH=master
-ARG OPENSTACK_TAG=stable/
pike
+ARG OPENSTACK_TAG=stable/
queens
ARG VIMS_TAG=stable
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 \
RUN apk --no-cache add --update \
ruby ruby-bundler ruby-irb ruby-rdoc dnsmasq \
@@
-18,8
+23,12
@@
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 && \
-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
(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
+COPY testcases.yaml /usr/lib/python2.7/site-packages/
xtesting
/ci/testcases.yaml
CMD ["run_tests", "-t", "all"]
CMD ["run_tests", "-t", "all"]