diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2018-07-24 09:40:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-07-24 09:40:24 +0000 |
| commit | a38b55bbba3c7b6a354fc29da6bc3518c57caf52 (patch) | |
| tree | e18b245bf7c2bb4b610c056234e37940935a21b6 /docker/vnf | |
| parent | 8a00300b730d7302aff5f23e51669f1c12ef369e (diff) | |
| parent | 026a9bfaa656d0e5ade327feda64f17796d6f209 (diff) | |
Merge "New Heat IMS testcase"
Diffstat (limited to 'docker/vnf')
| -rw-r--r-- | docker/vnf/Dockerfile | 8 | ||||
| -rw-r--r-- | docker/vnf/testcases.yaml | 17 |
2 files changed, 21 insertions, 4 deletions
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 diff --git a/docker/vnf/testcases.yaml b/docker/vnf/testcases.yaml index 1b2bd9822..1f0817708 100644 --- a/docker/vnf/testcases.yaml +++ b/docker/vnf/testcases.yaml @@ -21,7 +21,7 @@ tiers: - case_name: cloudify_ims project_name: functest - criteria: 80 + criteria: 100 blocking: false description: >- This test case deploys an OpenSource vIMS solution from @@ -34,6 +34,21 @@ tiers: class: 'CloudifyIms' - + case_name: heat_ims + project_name: functest + criteria: 100 + blocking: false + description: >- + This test case deploys an OpenSource vIMS solution from + Clearwater using the OpenStack Heat orchestrator. + It also runs some signaling traffic. + dependencies: + - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha' + run: + module: 'functest.opnfv_tests.vnf.ims.heat_ims' + class: 'HeatIms' + + - case_name: vyos_vrouter project_name: functest criteria: 100 |