aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/robot
diff options
context:
space:
mode:
authorMandeep Khinda <Mandeep.Khinda@amdocs.com>2018-06-27 13:40:59 +0000
committerGerrit Code Review <gerrit@onap.org>2018-06-27 13:40:59 +0000
commit96cec738db145bec9d87ebd79eb3eabcb10e4f38 (patch)
treea0045b5ad275a9430257fc7b978944981fbd387d /kubernetes/robot
parent56e950f4095f8b1be0705e3471d57dd21af06f5d (diff)
parent16fc76018b882f2240c503f5c5f5a9da7baa8e73 (diff)
Merge "Fix Policy Nexus liveness initialDelaySeconds"
Diffstat (limited to 'kubernetes/robot')
-rwxr-xr-xkubernetes/robot/resources/config/eteshare/config/vm_properties.py4
-rw-r--r--kubernetes/robot/values.yaml2
2 files changed, 3 insertions, 3 deletions
diff --git a/kubernetes/robot/resources/config/eteshare/config/vm_properties.py b/kubernetes/robot/resources/config/eteshare/config/vm_properties.py
index 261d345c84..62f0b630a2 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_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 = "master"
+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" : "master",
+ "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/kubernetes/robot/values.yaml b/kubernetes/robot/values.yaml
index cc81b9d110..13b1a454da 100644
--- a/kubernetes/robot/values.yaml
+++ b/kubernetes/robot/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: master
+ gerritBranch: 2.0.0-ONAP
# gerrit project where the latest heat code is checked in
gerritProject: http://gerrit.onap.org/r/demo.git