Use VNF heat templates in the testsuite image

Change to use the VNF templates already cloned inside
the testsuite docker image intead of relying on an
external copy.

Also remove unnessary ConfigMaps and initContainers
as a result of this change.

Change-Id: Idedb48169e497d3485dcb89279d1ed5f3356105a
Issue-ID: INT-605
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>

diff --git a/kubernetes/robot/resources/config/authorization b/kubernetes/robot/resources/config/authorization
deleted file mode 100755 (executable)
index 23b429e..0000000
--- a/kubernetes/robot/resources/config/authorization
+++ /dev/null
@@ -1 +0,0 @@
-{{ .Values.config.lightHttpdUsername }}:{{ .Values.config.lightHttpdPassword }}

diff --git a/kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py b/kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py b/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py
old mode 100755 (executable)
new mode 100644 (file)
index f2a4399..2bbb275
--- a/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py
+++ b/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py
@@ -98,7 +98,7 @@ GLOBAL_PROXY_WARNING_CONTINUE_XPATH=""
 # dns info
 GLOBAL_DNS_TRAFFIC_DURATION = "600"
 # location where heat templates are loaded from
-GLOBAL_HEAT_TEMPLATES_FOLDER = "/share/heat"
+GLOBAL_HEAT_TEMPLATES_FOLDER = "/var/opt/OpenECOMP_ETE/demo/heat"
 # Log info
 GLOBAL_LOG_SERVER_PROTOCOL = "http"
 GLOBAL_LOG_ELASTICSEARCH_PORT = "9200"

diff --git a/kubernetes/robot/resources/config/eteshare/config/vm_config2robot.sh b/kubernetes/robot/resources/config/eteshare/config/vm_config2robot.sh
deleted file mode 100755 (executable)
index c50fa5f..0000000
--- a/kubernetes/robot/resources/config/eteshare/config/vm_config2robot.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-#
-# Make vm1_robot config available to robot
-#
-CONFIG=/opt/config
-PROPERTIES=/opt/eteshare/config/vm_properties.py
-GLOBAL_VM_PROPERTIES="# File generated from /opt/config\n#\n"
-HASH="GLOBAL_INJECTED_PROPERTIES={"
-COMMA=""
-for f in `ls $CONFIG/*.txt`;
-do
-    VALUE=`cat $f`
-    NAME=${f%.*}
-    NAME=${NAME##*/}
-    NAME=${NAME^^}
-    GLOBAL_VM_PROPERTIES=$"${GLOBAL_VM_PROPERTIES}GLOBAL_INJECTED_$NAME = \"$VALUE\"\n"
-       HASH=$"${HASH}${COMMA}\n\"GLOBAL_INJECTED_$NAME\" : \"$VALUE\""
-       COMMA=","
-done
-HASH="${HASH}}\n"
-GLOBAL_VM_PROPERTIES="${GLOBAL_VM_PROPERTIES}\n${HASH}"
-GLOBAL_VM_PROPERTIES=${GLOBAL_VM_PROPERTIES}
-echo -e $GLOBAL_VM_PROPERTIES > $PROPERTIES

diff --git a/kubernetes/robot/resources/config/eteshare/config/vm_properties.py b/kubernetes/robot/resources/config/eteshare/config/vm_properties.py
old mode 100755 (executable)
new mode 100644 (file)
index b28ea2a..7631966
--- a/kubernetes/robot/resources/config/eteshare/config/vm_properties.py
+++ b/kubernetes/robot/resources/config/eteshare/config/vm_properties.py
@@ -12,7 +12,6 @@ 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 = "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" .}}"
@@ -38,7 +37,6 @@ GLOBAL_INJECTED_POLICY_HEALTHCHECK_IP_ADDR = "drools.{{include "common.namespace
 GLOBAL_INJECTED_PORTAL_IP_ADDR = "portal-app.{{include "common.namespace" .}}"
 GLOBAL_INJECTED_PUBLIC_NET_ID = "{{ .Values.openStackPublicNetId }}"
 GLOBAL_INJECTED_REGION = "{{ .Values.openStackRegion }}"
-GLOBAL_INJECTED_REMOTE_REPO = "http://gerrit.onap.org/r/testsuite/properties.git"
 GLOBAL_INJECTED_SCRIPT_VERSION = "{{ .Values.scriptVersion }}"
 GLOBAL_INJECTED_SDC_BE_IP_ADDR = "sdc-be.{{include "common.namespace" .}}"
 GLOBAL_INJECTED_SDC_BE_ONBOARD_IP_ADDR = "sdc-onboarding-be.{{include "common.namespace" .}}"
@@ -67,7 +65,6 @@ 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" : "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" .}}",
@@ -93,7 +90,6 @@ GLOBAL_INJECTED_PROPERTIES = {
     "GLOBAL_INJECTED_PORTAL_IP_ADDR" : "portal-app.{{include "common.namespace" .}}",
     "GLOBAL_INJECTED_PUBLIC_NET_ID" : "{{ .Values.openStackPublicNetId }}",
     "GLOBAL_INJECTED_REGION" : "{{ .Values.openStackRegion }}",
-    "GLOBAL_INJECTED_REMOTE_REPO" : "http://gerrit.onap.org/r/testsuite/properties.git",
     "GLOBAL_INJECTED_SDC_BE_IP_ADDR" : "sdc-be.{{include "common.namespace" .}}",
     "GLOBAL_INJECTED_SDC_BE_ONBOARD_IP_ADDR" : "sdc-onboarding-be.{{include "common.namespace" .}}",
     "GLOBAL_INJECTED_SDC_FE_IP_ADDR" : "sdc-fe.{{include "common.namespace" .}}",

diff --git a/kubernetes/robot/templates/configmap.yaml b/kubernetes/robot/templates/configmap.yaml
index e4096b0..6664c0d 100644 (file)
--- a/kubernetes/robot/templates/configmap.yaml
+++ b/kubernetes/robot/templates/configmap.yaml
@@ -23,7 +23,3 @@ data:
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "common.fullname" . }}-lighttpd-authorization-configmap
-  namespace: {{ include "common.namespace" . }}
-data:
-{{ tpl (.Files.Glob "resources/config/authorization").AsConfig . | indent 2 }}

diff --git a/kubernetes/robot/templates/deployment.yaml b/kubernetes/robot/templates/deployment.yaml
index 1297760..3b07602 100644 (file)
--- a/kubernetes/robot/templates/deployment.yaml
+++ b/kubernetes/robot/templates/deployment.yaml
@@ -30,21 +30,6 @@ spec:
         app: {{ include "common.name" . }}
         release: {{ .Release.Name }}
     spec:
-      initContainers:
-      - name: {{ include "common.name" . }}-inject-demo-project
-        command:
-        - /bin/bash
-        - -c
-        - >
-          git clone -b {{ .Values.config.gerritBranch }} --single-branch {{ .Values.config.gerritProject }} /tmp/gerrit;
-          echo "Clone complete. Copying from /tmp/gerrit/heat to /share";
-          cp -rf /tmp/gerrit/heat /share;
-          echo "Done.";
-        image: "{{ .Values.global.ubuntuInitRepository }}/{{ .Values.ubuntuInitImage }}"
-        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-        volumeMounts:
-        - name: demodir
-          mountPath: "/share"
       containers:
       - name: {{ include "common.name" . }}
         image: "{{ include "common.repository" . }}/{{ .Values.image }}"
@@ -69,11 +54,6 @@ spec:
           readOnly: true
         - name: robot-eteshare
           mountPath: /share/config
-        - name: robot-lighttpd-authorization
-          mountPath: /etc/lighttpd/authorization
-          subPath: authorization
-        - name: demodir
-          mountPath: /share
         - name: robot-logs
           mountPath: /share/logs
         resources:
@@ -101,10 +81,5 @@ spec:
         configMap:
           name: {{ include "common.fullname" . }}-eteshare-configmap
           defaultMode: 0755
-      - name: robot-lighttpd-authorization
-        configMap:
-          name: {{ include "common.fullname" . }}-lighttpd-authorization-configmap
-      - name: demodir
-        emptyDir: {}
       imagePullSecrets:
       - name: "{{ include "common.namespace" . }}-docker-registry-key"

diff --git a/kubernetes/robot/values.yaml b/kubernetes/robot/values.yaml
index aea67c8..8a28e89 100644 (file)
--- a/kubernetes/robot/values.yaml
+++ b/kubernetes/robot/values.yaml
@@ -34,15 +34,6 @@ debugEnabled: false
 # Application configuration defaults.
 #################################################################
 config:
-  # Username of the lighthttpd server.  Used for HTML auth for webpage access
-  lightHttpdUsername: robot
-  # 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: 2.0.0-ONAP
-  # gerrit project where the latest heat code is checked in
-  gerritProject: http://gerrit.onap.org/r/demo.git
-
 
 # Demo configuration
 # Nexus demo artifact version.  Maps to GLOBAL_INJECTED_ARTIFACTS_VERSION