summaryrefslogtreecommitdiffstats
path: root/docker/vnf
diff options
context:
space:
mode:
authorJuha Kosonen <juha.kosonen@nokia.com>2019-02-11 13:40:57 +0000
committerGerrit Code Review <gerrit@opnfv.org>2019-02-11 13:40:57 +0000
commit2645e3a60d536af5a2b1d93ea3dfac963fd887a3 (patch)
tree7a945d22d4a9a2c536786e77218eacca4d494852 /docker/vnf
parent4dc1c50f6f73f1ca420228130ef35dc2534e5596 (diff)
parent97dde581982b9d49122aee3630328fb6064c8609 (diff)
Merge "Update and enable Cloudify-based testcases"
Diffstat (limited to 'docker/vnf')
-rw-r--r--docker/vnf/Dockerfile5
-rw-r--r--docker/vnf/testcases.yaml2
2 files changed, 3 insertions, 4 deletions
diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile
index e915120ed..f22784dca 100644
--- a/docker/vnf/Dockerfile
+++ b/docker/vnf/Dockerfile
@@ -4,9 +4,10 @@ ARG BRANCH=master
ARG OPENSTACK_TAG=master
ARG VIMS_TEST_TAG=release-130
ARG QUAFF_TAG=59213d6d8ee29433552bb75f505cdc96b0b18909
-ARG CLOUDIFY_VIMS_TAG=fraser
+ARG CLOUDIFY_VIMS_TAG=gambia
ARG HEAT_VIMS_TAG=release-130
ARG VROUTER_TAG=fraser
+ARG VROUTER_BP_TAG=b16be2bfc4acabfec015300d294762b2da56c3a8
ARG JUJU_TAG=tags/juju-2.3.9
ARG JUJU_WAIT_TAG=2.6.4
ARG ABOT_CHARM=opnfv-fraser
@@ -46,7 +47,7 @@ RUN apk --no-cache add --update \
git checkout FETCH_HEAD) && \
git init /src/opnfv-vnf-vyos-blueprint && \
(cd /src/opnfv-vnf-vyos-blueprint && \
- git fetch --tags https://github.com/oolorg/opnfv-vnf-vyos-blueprint.git $VROUTER_TAG && \
+ git fetch --tags https://github.com/oolorg/opnfv-vnf-vyos-blueprint.git $VROUTER_BP_TAG && \
git checkout FETCH_HEAD) && \
mkdir -p /home/opnfv/functest/data/router && \
git init /home/opnfv/functest/data/router/opnfv-vnf-data && \
diff --git a/docker/vnf/testcases.yaml b/docker/vnf/testcases.yaml
index a654bcb8e..7d5548b38 100644
--- a/docker/vnf/testcases.yaml
+++ b/docker/vnf/testcases.yaml
@@ -20,7 +20,6 @@ tiers:
project_name: functest
criteria: 100
blocking: false
- enabled: false
description: >-
This test case deploys an OpenSource vIMS solution from
Clearwater using the Cloudify orchestrator. It also runs
@@ -45,7 +44,6 @@ tiers:
project_name: functest
criteria: 100
blocking: false
- enabled: false
description: >-
This test case is vRouter testing.
run: