summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-05-11 14:22:12 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2018-05-11 19:07:57 +0200
commit8a0b00906640707b90fccf76766bc7dec25a0bac (patch)
treeb57ab0c8e211bbd39961d7a29282f448fec46231 /docker
parent03ef3ebd7f2f85c6b3691bdd0ce69ab4cb9d9f85 (diff)
Install Cloudify descritors in functest-vnf
It completes [1] to fix gates [2] and stops getting thirdparty vnf master (dependencies). It also prints data to ease debugging. [1] https://github.com/Orange-OpenSource/opnfv-cloudify-clearwater/commit/abd39d772c77317a25745feaaf312165e7588346 [2] https://build.opnfv.org/ci/view/functest/job/functest-apex-baremetal-daily-fraser/110/console Conflicts: docker/vnf/Dockerfile functest/opnfv_tests/vnf/ims/cloudify_ims.yaml Change-Id: Ib317a491e54820f4edb01fcecfca9d2a08b40c0f Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 19807ef8967c21da41fe5f5566751be8de250434)
Diffstat (limited to 'docker')
-rw-r--r--docker/vnf/Dockerfile11
1 files changed, 8 insertions, 3 deletions
diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile
index 06117419d..37fe364da 100644
--- a/docker/vnf/Dockerfile
+++ b/docker/vnf/Dockerfile
@@ -2,7 +2,9 @@ FROM opnfv/functest-core:fraser
ARG BRANCH=stable/fraser
ARG OPENSTACK_TAG=stable/pike
-ARG VIMS_TAG=stable
+ARG VIMS_TEST_TAG=stable
+ARG VIMS_TAG=fraser
+ARG VROUTER_TAG=fraser
ARG JUJU_TAG=tags/juju-2.2.5
ARG ABOT_TAG=opnfv-fraser
@@ -18,7 +20,9 @@ RUN apk --no-cache add --update \
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 && \
+ git clone --depth 1 -b $VIMS_TEST_TAG https://github.com/boucherv-orange/clearwater-live-test.git /src/vims-test && \
+ git clone --depth 1 -b $VIMS_TAG https://github.com/Orange-OpenSource/opnfv-cloudify-clearwater.git /src/vims && \
+ git clone --depth 1 -b $VROUTER_TAG https://github.com/oolorg/opnfv-vnf-vyos-blueprint.git /src/opnfv-vnf-vyos-blueprint && \
git clone https://github.com/RebacaInc/abot_charm.git /src/epc-requirements/abot_charm && \
(cd /src/epc-requirements/abot_charm && git checkout $ABOT_TAG) && \
python3 -m pip install --no-cache-dir --src /src -cupper-constraints.txt \
@@ -30,7 +34,8 @@ RUN apk --no-cache add --update \
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 && \
+ rm -r upper-constraints.txt /src/vims-test/.git /src/vims/.git /src/opnfv-vnf-vyos-blueprint/.git \
+ /src/epc-requirements/abot_charm/.git && \
apk del .build-deps
COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml
CMD ["run_tests", "-t", "all"]