diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2018-06-11 09:25:34 -0700 |
|---|---|---|
| committer | Gary Wu <gary.i.wu@huawei.com> | 2018-06-11 09:30:13 -0700 |
| commit | 291ae2209384e3956b20a2151e18f507a9dbd9bb (patch) | |
| tree | aaad65b28bbd8066f93bbfd26224c68b56e450e7 | |
| parent | 636905c68b3249345c017a891b1a6ad8b45cc1b2 (diff) | |
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>
| -rwxr-xr-x | resources/config/eteshare/config/vm_properties.py | 4 | ||||
| -rw-r--r-- | values.yaml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/resources/config/eteshare/config/vm_properties.py b/resources/config/eteshare/config/vm_properties.py index cfa789a..62f0b63 100755 --- a/resources/config/eteshare/config/vm_properties.py +++ b/resources/config/eteshare/config/vm_properties.py @@ -12,7 +12,7 @@ GLOBAL_INJECTED_DCAE_IP_ADDR = "dcae-healthcheck.{{include "common.namespace" .} 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_PROPERTIES = { "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" .}}", diff --git a/values.yaml b/values.yaml index 2d7df04..13b1a45 100644 --- a/values.yaml +++ b/values.yaml @@ -38,7 +38,7 @@ config: # 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 |