Merge "[ROBOT] ADD BULKPM testsuite to use helm based component services"

diff --combined kubernetes/robot/resources/config/eteshare/config/robot_properties.py
index 5b51b70,824b96c..9076a1f
--- 1/kubernetes/robot/resources/config/eteshare/config/robot_properties.py
--- 2/kubernetes/robot/resources/config/eteshare/config/robot_properties.py
+++ b/kubernetes/robot/resources/config/eteshare/config/robot_properties.py
@@@ -230,6 -230,16 +230,16 @@@ GLOBAL_INVENTORY_SERVER_PORT = '{{inclu
  GLOBAL_DEPLOYMENT_HANDLER_SERVER_NAME = '{{include "robot.ingress.svchost" (dict "root" . "hostname" "deployment-handler") }}'
  GLOBAL_DEPLOYMENT_HANDLER_SERVER_PROTOCOL = "https"
  GLOBAL_DEPLOYMENT_HANDLER_SERVER_PORT = '{{include "robot.ingress.port" (dict "root" . "hostname" "deployment-handler" "port" 8443) }}'
+ GLOBAL_K8S_CHART_REPOSTORY_SERVER_NAME = '{{include "robot.ingress.svchost" (dict "root" . "hostname" "chart-museum") }}'
+ GLOBAL_K8S_CHART_REPOSTORY_SERVER_PROTOCOL = "http"
+ GLOBAL_K8S_CHART_REPOSTORY_SERVER_PORT = '{{include "robot.ingress.port" (dict "root" . "hostname" "chart-museum" "port" 80) }}'
+ GLOBAL_K8S_CHART_REPOSTORY_SERVER_USERNAME = '{{ .Values.k8sChartRepoUsername }}'
+ GLOBAL_K8S_CHART_REPOSTORY_SERVER_PASSWORD = '{{ .Values.k8sChartRepoPassword }}'
+ # consul info
+ GLOBAL_CONSUL_SERVER_NAME = '{{include "robot.ingress.svchost" (dict "root" . "hostname" "consul-server-ui") }}'
+ GLOBAL_CONSUL_SERVER_PROTOCOL = "http"
+ GLOBAL_CONSUL_SERVER_PORT = '{{include "robot.ingress.port" (dict "root" . "hostname" "consul-server-ui" "port" 8500) }}'
+ 
  # dcae mod info
  GLOBAL_DCAEMOD_ONBOARDING_API_SERVER_PROTOCOL = "http"
  GLOBAL_DCAEMOD_ONBOARDING_API_SERVER_PORT = '{{include "robot.ingress.port" (dict "root" . "hostname" "dcaemod-onboarding-api" "port" 8080) }}'
@@@ -311,8 -321,6 +321,8 @@@ GLOBAL_POLICY_USERNAME = '{{ .Values.po
  GLOBAL_POLICY_PASSWORD = '{{ .Values.policyPassword }}'
  GLOBAL_POLICY_HEALTHCHECK_USERNAME = '{{ .Values.policyComponentUsername }}'
  GLOBAL_POLICY_HEALTHCHECK_PASSWORD = '{{ .Values.policyComponentPassword }}'
 +GLOBAL_POLICY_ADMIN_USERNAME = '{{ .Values.policyAdminUsername }}'
 +GLOBAL_POLICY_ADMIN_PASSWORD = '{{ .Values.policyAdminPassword }}'
  # portal info - everything is from the private oam network (also called onap private network)
  GLOBAL_PORTAL_SERVER_PROTOCOL = "https"
  GLOBAL_PORTAL_SERVER_PORT = '{{include "robot.ingress.port" (dict "root" . "hostname" "portal-app" "port" 8443) }}'

diff --combined kubernetes/robot/values.yaml
index 087fc85,ed4b5db..89d83c8
--- 1/kubernetes/robot/values.yaml
--- 2/kubernetes/robot/values.yaml
+++ b/kubernetes/robot/values.yaml
@@@ -340,8 -340,6 +340,8 @@@ policyUsername: "demo@people.osaaf.org
  policyPassword: "demo123456!"
  policyComponentUsername: "healthcheck"
  policyComponentPassword: "zb!XztG34"
 +policyAdminUsername: "policyadmin"
 +policyAdminPassword: "zb!XztG34"
  # PORTAL
  portalUsername: "demo"
  portalPassword: "Kp8bJ4SXszM0WXlhak3eHlcse"
@@@ -375,6 -373,10 +375,10 @@@ oofOsdfPciOptPassword: "demo123456!
  oofHomingUsername: "admin1"
  oofHomingPassword: "plan.15"
  
+ #K8S chart repository - ChartMuseum
+ k8sChartRepoUsername: "onapinitializer"
+ k8sChartRepoPassword: "demo123456!"
+ 
  
  # default number of instances
  replicaCount: 1