diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-11-14 15:56:15 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-11-15 21:51:07 +0100 |
| commit | f50dff6b8c5b349ea43b85b15002931c46aa96a7 (patch) | |
| tree | fc3f17e04618b7d374b5849699631e252539adc7 /docker/vnf | |
| parent | 8fef6eeec2256395dc1dbaf2d8484ebf78b8a38b (diff) | |
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)
Diffstat (limited to 'docker/vnf')
| -rw-r--r-- | docker/vnf/Dockerfile | 8 |
1 files changed, 7 insertions, 1 deletions
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 |