From f50dff6b8c5b349ea43b85b15002931c46aa96a7 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Wed, 14 Nov 2018 15:56:15 +0100 Subject: Switch to Clearwater Zamin (heat_ims) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 (cherry picked from commit 3ac3d8d6f725b76ccb22a730cd802f36f75c8b90) --- docker/vnf/Dockerfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'docker/vnf') 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 -- cgit 1.2.3-korg