From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Wed, 14 Nov 2018 14:56:15 +0000 (+0100)
Subject: Switch to Clearwater Zamin (heat_ims)
X-Git-Tag: opnfv-8.1.0~111
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=f50dff6b8c5b349ea43b85b15002931c46aa96a7;p=functest.git

Switch to Clearwater Zamin (heat_ims)

Zamin is declared as the first "stable" release.
Cloudify descriptor is not ready for the update.

Change-Id: Ibfd2e3a226e1a547dd8c4e32ff998bac007f10a5
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 3ac3d8d6f725b76ccb22a730cd802f36f75c8b90)
---

diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile
index d36b23b3f..46e5212d6 100644
--- a/docker/vnf/Dockerfile
+++ b/docker/vnf/Dockerfile
@@ -1,11 +1,17 @@
 FROM opnfv/functest-core:hunter
 
+<<<<<<< HEAD
 ARG BRANCH=stable/hunter
 ARG OPENSTACK_TAG=stable/rocky
 ARG VIMS_TEST_TAG=release-129
+=======
+ARG BRANCH=master
+ARG OPENSTACK_TAG=master
+ARG VIMS_TEST_TAG=release-130
+>>>>>>> 3ac3d8d... Switch to Clearwater Zamin (heat_ims)
 ARG QUAFF_TAG=59213d6d8ee29433552bb75f505cdc96b0b18909
 ARG CLOUDIFY_VIMS_TAG=fraser
-ARG HEAT_VIMS_TAG=release-129
+ARG HEAT_VIMS_TAG=release-130
 ARG VROUTER_TAG=fraser
 ARG JUJU_TAG=tags/juju-2.3.9
 ARG JUJU_WAIT_TAG=2.6.4
diff --git a/functest/opnfv_tests/vnf/ims/heat_ims.yaml b/functest/opnfv_tests/vnf/ims/heat_ims.yaml
index 883c4dffe..2ccdc0bf7 100644
--- a/functest/opnfv_tests/vnf/ims/heat_ims.yaml
+++ b/functest/opnfv_tests/vnf/ims/heat_ims.yaml
@@ -4,11 +4,11 @@ orchestrator:
     version: '4.0'
 vnf:
     name: clearwater
-    version: '129'
+    version: '130'
     descriptor:
         file_name: /src/heat_vims/clearwater.yaml
         name: clearwater-opnfv
-        version: '129'
+        version: '130'
     inputs:
         zone: clearwater.opnfv
         dn_range_start: "6505550000"