From 026a9bfaa656d0e5ade327feda64f17796d6f209 Mon Sep 17 00:00:00 2001 From: Valentin Boucher Date: Thu, 19 Jul 2018 11:35:50 -0400 Subject: New Heat IMS testcase In order to validate OpenStack Master deployment we create this new testcase using OpenStack Heat as an Orchestrator for Clearwater VNF JIRA: FUNCTEST-995 Change-Id: I8b7b74a3753c2d4d4614e9a2798283bd3f99d5d2 Signed-off-by: Valentin Boucher --- docker/vnf/Dockerfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'docker/vnf/Dockerfile') diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile index 09bb6fb5a..192c528ad 100644 --- a/docker/vnf/Dockerfile +++ b/docker/vnf/Dockerfile @@ -4,7 +4,8 @@ ARG BRANCH=master ARG OPENSTACK_TAG=stable/queens ARG VIMS_TEST_TAG=release-129 ARG QUAFF_TAG=59213d6d8ee29433552bb75f505cdc96b0b18909 -ARG VIMS_TAG=fraser +ARG CLOUDIFY_VIMS_TAG=fraser +ARG HEAT_VIMS_TAG=release-129 ARG VROUTER_TAG=fraser ARG JUJU_TAG=tags/juju-2.2.5 @@ -27,7 +28,8 @@ RUN apk --no-cache add --update \ git clone https://github.com/Metaswitch/quaff /src/vims-test/quaff && \ (cd /src/vims-test/quaff && git checkout $QUAFF_TAG) && \ git clone --depth 1 -b $VIMS_TEST_TAG https://github.com/Metaswitch/clearwater-build-infra /src/vims-test/build-infra && \ - git clone --depth 1 -b $VIMS_TAG https://github.com/Orange-OpenSource/opnfv-cloudify-clearwater.git /src/vims && \ + git clone --depth 1 -b $CLOUDIFY_VIMS_TAG https://github.com/Orange-OpenSource/opnfv-cloudify-clearwater.git /src/cloudify_vims && \ + git clone --depth 1 -b $HEAT_VIMS_TAG https://github.com/Metaswitch/clearwater-heat.git /src/heat_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 && \ python3 -m pip install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \ @@ -38,7 +40,7 @@ RUN apk --no-cache add --update \ go install -v github.com/juju/juju/... && \ rm -r $GOPATH/src/ $GOPATH/pkg && \ (cd /src/vims-test && bundle config build.nokogiri --use-system-libraries && bundle install --system) && \ - rm -r upper-constraints.txt upper-constraints.opnfv.txt /src/vims-test/.git /src/vims/.git /src/vims-test/quaff/.git \ + rm -r upper-constraints.txt upper-constraints.opnfv.txt /src/vims-test/.git /src/cloudify_vims/.git /src/heat_vims/.git /src/vims-test/quaff/.git \ /src/vims-test/build-infra/.git /src/opnfv-vnf-vyos-blueprint/.git \ /src/epc-requirements/abot_charm/.git && \ apk del .build-deps -- cgit 1.2.3-korg