From 6344b1083e82c2d3e523e2407275a0aec1330f3d Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Mon, 30 Jul 2018 10:28:46 -0700 Subject: 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 --- resources/config/authorization | 1 - .../config/integration_preload_parameters.py | 0 .../config/integration_robot_properties.py | 2 +- .../config/eteshare/config/vm_config2robot.sh | 24 ---------------------- resources/config/eteshare/config/vm_properties.py | 4 ---- 5 files changed, 1 insertion(+), 30 deletions(-) delete mode 100755 resources/config/authorization mode change 100755 => 100644 resources/config/eteshare/config/integration_preload_parameters.py mode change 100755 => 100644 resources/config/eteshare/config/integration_robot_properties.py delete mode 100755 resources/config/eteshare/config/vm_config2robot.sh mode change 100755 => 100644 resources/config/eteshare/config/vm_properties.py (limited to 'resources') diff --git a/resources/config/authorization b/resources/config/authorization deleted file mode 100755 index 23b429e..0000000 --- a/resources/config/authorization +++ /dev/null @@ -1 +0,0 @@ -{{ .Values.config.lightHttpdUsername }}:{{ .Values.config.lightHttpdPassword }} diff --git a/resources/config/eteshare/config/integration_preload_parameters.py b/resources/config/eteshare/config/integration_preload_parameters.py old mode 100755 new mode 100644 diff --git a/resources/config/eteshare/config/integration_robot_properties.py b/resources/config/eteshare/config/integration_robot_properties.py old mode 100755 new mode 100644 index f2a4399..2bbb275 --- a/resources/config/eteshare/config/integration_robot_properties.py +++ b/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/resources/config/eteshare/config/vm_config2robot.sh b/resources/config/eteshare/config/vm_config2robot.sh deleted file mode 100755 index c50fa5f..0000000 --- a/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/resources/config/eteshare/config/vm_properties.py b/resources/config/eteshare/config/vm_properties.py old mode 100755 new mode 100644 index b28ea2a..7631966 --- a/resources/config/eteshare/config/vm_properties.py +++ b/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" .}}", -- cgit 1.2.3-korg