aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Hansen <tony@att.com>2019-10-13 00:41:28 +0000
committerGerrit Code Review <gerrit@onap.org>2019-10-13 00:41:28 +0000
commitc09091a3586793b74351e908ab344af6aa2fd916 (patch)
tree0fc411ee3bbd7e2a39a2906650adbc2d3ec0f035
parent26bc22297811ba2d0e37b512516a86474689d879 (diff)
parent076b6eedd7e1a67315593aaad9756d6cdeef9373 (diff)
Merge "Fix of configmap issue"
-rwxr-xr-xtools/performance/cloud/cloud-based-performance-test.sh9
1 files changed, 6 insertions, 3 deletions
diff --git a/tools/performance/cloud/cloud-based-performance-test.sh b/tools/performance/cloud/cloud-based-performance-test.sh
index 31299cc0..78ab7717 100755
--- a/tools/performance/cloud/cloud-based-performance-test.sh
+++ b/tools/performance/cloud/cloud-based-performance-test.sh
@@ -20,7 +20,6 @@
SCRIPT_DIRECTORY="$(pwd "$0")"
CONTAINERS_COUNT=1
PROPERTIES_FILE=${SCRIPT_DIRECTORY}/test.properties
-CONFIG_MAP_NAME=performance-test-config
PRODUCER_APPS_LABEL=hv-collector-producer
CONSUMER_APPS_LABEL=hv-collector-kafka-consumer
PROMETHEUS_CONF_LABEL=prometheus-server-conf
@@ -40,7 +39,7 @@ function clean() {
echo "Cleaning up environment"
echo "Attempting to delete test parameters ConfigMap"
- kubectl delete configmap ${CONFIG_MAP_NAME} -n ${ONAP_NAMESPACE}
+ kubectl delete configmap performance-test-config -n ${ONAP_NAMESPACE}
echo "Attempting to delete prometheus ConfigMap"
kubectl delete configmap -l name=${PROMETHEUS_CONF_LABEL} -n ${ONAP_NAMESPACE}
@@ -84,6 +83,10 @@ function copy_certs_to_hvves() {
}
function create_producers() {
+ echo "Recreating test properties ConfigMap from: $PROPERTIES_FILE"
+ kubectl delete configmap performance-test-config -n ${ONAP_NAMESPACE}
+ kubectl create configmap performance-test-config --from-env-file=${PROPERTIES_FILE} -n ${ONAP_NAMESPACE}
+
set -e
for i in $(seq 1 ${CONTAINERS_COUNT});
do
@@ -132,7 +135,7 @@ function setup_environment() {
cd ${SCRIPT_DIRECTORY}
echo "Creating test properties ConfigMap from: $PROPERTIES_FILE"
- kubectl create configmap ${CONFIG_MAP_NAME} --from-env-file=${PROPERTIES_FILE} -n ${ONAP_NAMESPACE}
+ kubectl create configmap performance-test-config --from-env-file=${PROPERTIES_FILE} -n ${ONAP_NAMESPACE}
echo "Creating consumer deployment"
kubectl apply -f consumer-deployment.yaml