diff options
| author |   Valentin Boucher <valentin.boucher@kontron.com> | 2018-07-19 11:35:50 -0400 |
|---|---|---|
| committer |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-07-30 15:29:50 +0200 |
| commit | 8d17ab4131af3285f12cc16a43d60ae95c887c69 (patch) | |
| tree | 98d42365fada7f6f1d8b806dd7d9a29535dadaee | |
| parent | 66308eef2d8a5a6b0c1d70d773a7ad37c2c82d16 (diff) | |
Fix cloudify src dirs
It completes "Refactor Ims testing" [1].
[1] https://gerrit.opnfv.org/gerrit/60331
Change-Id: I3d971a07ad1199ab48f81f7484d33e7f35d12377
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
| -rw-r--r-- | docker/vnf/Dockerfile | 6 | ||||
| -rw-r--r-- | docker/vnf/testcases.yaml | 2 | ||||
| -rw-r--r-- | functest/ci/testcases.yaml | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile index 5d4d42fa3..27c129725 100644 --- a/docker/vnf/Dockerfile +++ b/docker/vnf/Dockerfile @@ -4,7 +4,7 @@ ARG BRANCH=stable/fraser ARG OPENSTACK_TAG=stable/pike ARG VIMS_TEST_TAG=release-129 ARG QUAFF_TAG=59213d6d8ee29433552bb75f505cdc96b0b18909 -ARG VIMS_TAG=fraser +ARG CLOUDIFY_VIMS_TAG=fraser ARG VROUTER_TAG=fraser ARG JUJU_TAG=tags/juju-2.2.5 ARG ABOT_TAG=opnfv-fraser @@ -26,7 +26,7 @@ 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 $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) && \ @@ -39,7 +39,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 /src/vims-test/.git /src/vims/.git /src/vims-test/quaff/.git \ + rm -r upper-constraints.txt /src/vims-test/.git /src/cloudify_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 938f0b309..a05a9781e 100644 --- a/docker/vnf/testcases.yaml +++ b/docker/vnf/testcases.yaml @@ -10,7 +10,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 diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml index 20520ffdf..22ede2eb6 100644 --- a/functest/ci/testcases.yaml +++ b/functest/ci/testcases.yaml @@ -373,7 +373,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 |