summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2019-02-11 06:45:34 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2019-02-11 16:02:59 +0100
commitc7dfec04018cd720a49a665026d1864f1914a1a6 (patch)
tree5a33023a771bce9ee697cc41f729a2b22ade590c /docker
parent314faf01ac0da194088f5a821927f033026f17f0 (diff)
Update and enable Cloudify-based testcases
It switches from the Cloudify virtual machine to the community container which allows deploying vyos_vrouter and cloudify_ims. Last stable Cloudify OpenStack plugin (2.4.17) is now deployed. It also updates the Cloudify python package to latest release. It adds a delay before deleting the blueprint which may be improved in a second change (it allows enabling the testcase in the stable release). Change-Id: Ie48a2c9d2badab0d7ba0b9e7845f453fad335ef7 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 97dde581982b9d49122aee3630328fb6064c8609)
Diffstat (limited to 'docker')
-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 198f098c0..16ef7963a 100644
--- a/docker/vnf/Dockerfile
+++ b/docker/vnf/Dockerfile
@@ -4,9 +4,10 @@ ARG BRANCH=stable/hunter
ARG OPENSTACK_TAG=stable/rocky
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 61bcd0748..9822a515a 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: