commit 99352e5d65e2bab3f41e1e357221cc68df602e98
author Gary Wu <gary.i.wu@huawei.com> Mon Jun 11 09:25:34 2018 -0700
committer Gary Wu <gary.i.wu@huawei.com> Mon Jun 11 09:30:13 2018 -0700
tree 80673695ac70f02a9376fad41e061869192edf89
parent d78b74993cbaf2f0ef3c912341b0f3eea803c048

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: I30bbece5fa2e0b8622db948d45e08a46ecf43ece
Issue-ID: INT-506
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>

kubernetes/robot/resources/config/eteshare/config/vm_properties.py

diff --git a/kubernetes/robot/resources/config/eteshare/config/vm_properties.py b/kubernetes/robot/resources/config/eteshare/config/vm_properties.py
index cfa789a..62f0b63 100755
--- a/kubernetes/robot/resources/config/eteshare/config/vm_properties.py
+++ b/kubernetes/robot/resources/config/eteshare/config/vm_properties.py
@@ -12,7 +12,7 @@
 GLOBAL_INJECTED_DNS_IP_ADDR = "N/A"
 GLOBAL_INJECTED_DOCKER_VERSION = "1.2-STAGING-latest"
 GLOBAL_INJECTED_EXTERNAL_DNS = "N/A"
-GLOBAL_INJECTED_GERRIT_BRANCH = "beijing"
+GLOBAL_INJECTED_GERRIT_BRANCH = "2.0.0-ONAP"
 GLOBAL_INJECTED_LOG_ELASTICSEARCH_IP_ADDR = "log-es.{{include "common.namespace" .}}"
 GLOBAL_INJECTED_LOG_KIBANA_IP_ADDR = "log-kibana.{{include "common.namespace" .}}"
 GLOBAL_INJECTED_LOG_LOGSTASH_IP_ADDR = "log-ls-http.{{include "common.namespace" .}}"
@@ -67,7 +67,7 @@
     "GLOBAL_INJECTED_DNS_IP_ADDR" : "N/A",
     "GLOBAL_INJECTED_DOCKER_VERSION" : "1.2-STAGING-latest",
     "GLOBAL_INJECTED_EXTERNAL_DNS" : "N/A",
-    "GLOBAL_INJECTED_GERRIT_BRANCH" : "beijing",
+    "GLOBAL_INJECTED_GERRIT_BRANCH" : "2.0.0-ONAP",
     "GLOBAL_INJECTED_KEYSTONE" : "{{ .Values.openStackKeyStoneUrl }}",
     "GLOBAL_INJECTED_LOG_ELASTICSEARCH_IP_ADDR" : "log-es.{{include "common.namespace" .}}",
     "GLOBAL_INJECTED_LOG_KIBANA_IP_ADDR" : "log-kibana.{{include "common.namespace" .}}",

kubernetes/robot/values.yaml

diff --git a/kubernetes/robot/values.yaml b/kubernetes/robot/values.yaml
index 2d7df04..13b1a45 100644
--- a/kubernetes/robot/values.yaml
+++ b/kubernetes/robot/values.yaml
@@ -38,7 +38,7 @@
   # Password of the lighthttpd server.  Used for HTML auth for webpage access
   lightHttpdPassword: robot
   # gerrit branch where the latest heat code is checked in
-  gerritBranch: beijing
+  gerritBranch: 2.0.0-ONAP
   # gerrit project where the latest heat code is checked in
   gerritProject: http://gerrit.onap.org/r/demo.git