diff options
author | 2018-07-30 10:28:46 -0700 | |
---|---|---|
committer | 2018-08-08 13:42:41 -0700 | |
commit | 6344b1083e82c2d3e523e2407275a0aec1330f3d (patch) | |
tree | f3bff32a0b6eb9824fc1c0705d821e0837488c8d /resources/config/eteshare | |
parent | cf21a17719cd8f02b6ecd68abc2bced02d071af9 (diff) |
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>
Diffstat (limited to 'resources/config/eteshare')
-rw-r--r--[-rwxr-xr-x] | resources/config/eteshare/config/integration_preload_parameters.py | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | resources/config/eteshare/config/integration_robot_properties.py | 2 | ||||
-rwxr-xr-x | resources/config/eteshare/config/vm_config2robot.sh | 24 | ||||
-rw-r--r--[-rwxr-xr-x] | resources/config/eteshare/config/vm_properties.py | 4 |
4 files changed, 1 insertions, 29 deletions
diff --git a/resources/config/eteshare/config/integration_preload_parameters.py b/resources/config/eteshare/config/integration_preload_parameters.py index 17f33fc..17f33fc 100755..100644 --- a/resources/config/eteshare/config/integration_preload_parameters.py +++ b/resources/config/eteshare/config/integration_preload_parameters.py diff --git a/resources/config/eteshare/config/integration_robot_properties.py b/resources/config/eteshare/config/integration_robot_properties.py index f2a4399..2bbb275 100755..100644 --- 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 index b28ea2a..7631966 100755..100644 --- 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" .}}", |