summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-06-11 09:15:30 -0700
committerGary Wu <gary.i.wu@huawei.com>2018-06-11 09:27:05 -0700
commitec750e27d17e91a0a431973155421b6ca952b1b1 (patch)
treefaaf823a05539adb77d84d610f684b3691140ed8
parentf51c4ed1634c1fad68ce7430d56e3af28a659770 (diff)
Use 2.0.0-ONAP tag instead beijing branch2.0.0-ONAP2.0.0-ONAP
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>
-rw-r--r--heat/ONAP/onap_openstack.env34
-rw-r--r--heat/ONAP/onap_openstack_template.env34
2 files changed, 34 insertions, 34 deletions
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}