From: Gary Wu <gary.i.wu@huawei.com>
Date: Mon, 11 Jun 2018 16:15:30 +0000 (-0700)
Subject: Use 2.0.0-ONAP tag instead beijing branch
X-Git-Tag: 2.0.0-ONAP^0
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=demo.git;a=commitdiff_plain;h=ec750e27d17e91a0a431973155421b6ca952b1b1

Use 2.0.0-ONAP tag instead beijing branch

To ensure reproducible deployments, change gerrit branches to
2.0.0-ONAP tag instead of using the beijing branch since the
beijing branches are not locked.

Change-Id: I78c02e2a4153227160ce643fedf9b12f60c97e51
Issue-ID: INT-506
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
---

diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index f9ac9911..792f0de2 100644
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -104,23 +104,23 @@ parameters:
   #                              #
   ################################
 
-  aai_branch: beijing
-  appc_branch: beijing
-  so_branch: beijing
-  mr_branch: beijing
-  policy_branch: beijing
-  portal_branch: beijing
-  robot_branch: beijing
-  sdc_branch: beijing
-  sdnc_branch: beijing
-  vid_branch: beijing
-  clamp_branch: beijing
-  vnfsdk_branch: beijing
-  music_branch: beijing
-  nbi_branch: beijing
-  aaf_branch: beijing
-  sms_branch: beijing
-  oof_branch: beijing
+  aai_branch: 2.0.0-ONAP
+  appc_branch: 2.0.0-ONAP
+  so_branch: 2.0.0-ONAP
+  mr_branch: 2.0.0-ONAP
+  policy_branch: 2.0.0-ONAP
+  portal_branch: 2.0.0-ONAP
+  robot_branch: 2.0.0-ONAP
+  sdc_branch: 2.0.0-ONAP
+  sdnc_branch: 2.0.0-ONAP
+  vid_branch: 2.0.0-ONAP
+  clamp_branch: 2.0.0-ONAP
+  vnfsdk_branch: 2.0.0-ONAP
+  music_branch: 2.0.0-ONAP
+  nbi_branch: 2.0.0-ONAP
+  aaf_branch: 2.0.0-ONAP
+  sms_branch: 2.0.0-ONAP
+  oof_branch: 2.0.0-ONAP
 
   aai_docker: 1.2.2
   aai_sparky_docker: 1.2.2
diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env
index d7d290d0..b4200a0a 100644
--- a/heat/ONAP/onap_openstack_template.env
+++ b/heat/ONAP/onap_openstack_template.env
@@ -104,23 +104,23 @@ parameters:
   #                              #
   ################################
 
-  aai_branch: beijing
-  appc_branch: beijing
-  so_branch: beijing
-  mr_branch: beijing
-  policy_branch: beijing
-  portal_branch: beijing
-  robot_branch: beijing
-  sdc_branch: beijing
-  sdnc_branch: beijing
-  vid_branch: beijing
-  clamp_branch: beijing
-  vnfsdk_branch: beijing
-  music_branch: beijing
-  nbi_branch: beijing
-  aaf_branch: beijing
-  sms_branch: beijing
-  oof_branch: beijing
+  aai_branch: 2.0.0-ONAP
+  appc_branch: 2.0.0-ONAP
+  so_branch: 2.0.0-ONAP
+  mr_branch: 2.0.0-ONAP
+  policy_branch: 2.0.0-ONAP
+  portal_branch: 2.0.0-ONAP
+  robot_branch: 2.0.0-ONAP
+  sdc_branch: 2.0.0-ONAP
+  sdnc_branch: 2.0.0-ONAP
+  vid_branch: 2.0.0-ONAP
+  clamp_branch: 2.0.0-ONAP
+  vnfsdk_branch: 2.0.0-ONAP
+  music_branch: 2.0.0-ONAP
+  nbi_branch: 2.0.0-ONAP
+  aaf_branch: 2.0.0-ONAP
+  sms_branch: 2.0.0-ONAP
+  oof_branch: 2.0.0-ONAP
 
   aai_docker: ${AAI_RESOURCES_DOCKER}
   aai_sparky_docker: ${AAI_RESOURCES_DOCKER}