From: Gary Wu <gary.i.wu@huawei.com>
Date: Wed, 16 May 2018 20:33:51 +0000 (+0000)
Subject: Merge "Use release versions of demo and testsuite"
X-Git-Tag: v1.2.1~53
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=1150c09f6d9abbe2d3ce07ad6d1bf965c3b3d96d;hp=43a9023d2a7bc47212e652ad5319f7bd929ab766;p=demo.git

Merge "Use release versions of demo and testsuite"
---

diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index fa87e42e..0d42937f 100644
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -40,7 +40,7 @@ parameters:
 
   dmaap_topic: AUTO
 
-  artifacts_version: 1.2.0-SNAPSHOT
+  artifacts_version: 1.2.0
 
   openstack_tenant_id: PUT YOUR OPENSTACK PROJECT ID HERE
 
@@ -145,7 +145,7 @@ parameters:
   so_docker: 1.2.1
   policy_docker: 1.2.0
   portal_docker: v2.2.0
-  robot_docker: 1.2-STAGING-latest
+  robot_docker: 1.2.0
   sdc_docker: 1.2-STAGING-latest
   sdnc_docker: 1.3-STAGING-latest
   vid_docker: 1.2.1