Rename metrics files

Signed-off-by: Raul Sevilla <rsevilla@redhat.com>
cloud-bulldozer · Oct 15, 2021 · d7b967d · d7b967d
1 parent 5f26b61
commit d7b967d
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 12 deletions.
diff --git a/workloads/kube-burner/common.sh b/workloads/kube-burner/common.sh
@@ -38,18 +38,16 @@ deploy_operator() {
 }
 
 deploy_workload() {
+  set -e
   local tmpdir=$(mktemp -d)
   if [[ -z ${WORKLOAD_TEMPLATE} ]]; then
     log "WORKLOAD_TEMPLATE not defined or null!"
     exit 1
   fi
   cp -pR $(dirname ${WORKLOAD_TEMPLATE})/* ${tmpdir}
   envsubst < ${WORKLOAD_TEMPLATE} > ${tmpdir}/config.yml
-  if [[ -f metrics-profiles/${METRICS_PROFILE} ]]; then
-    cp metrics-profiles/${METRICS_PROFILE} ${tmpdir}/metrics.yml
-  fi
-  if [[ -f ${METRICS_PROFILE} ]]; then
-    cp ${METRICS_PROFILE} ${tmpdir}/metrics.yml
+  if [[ -n ${METRICS_PROFILE} ]]; then
+    cp metrics-profiles/${METRICS_PROFILE} ${tmpdir}/metrics.yml || cp ${METRICS_PROFILE} ${tmpdir}/metrics.yml
   fi
   if [[ -n ${ALERTS_PROFILE} ]]; then
    cp ${ALERTS_PROFILE} ${tmpdir}/alerts.yml
@@ -59,6 +57,7 @@ deploy_workload() {
   rm -rf ${tmpdir}
   log "Deploying benchmark"
   envsubst < kube-burner-crd.yaml | oc apply -f -
+  set +e
 }
 
 wait_for_benchmark() {

diff --git a/...r/metrics-profiles/metrics-aggregated.yml → .../metrics-profiles/metrics-aggregated.yaml b/...r/metrics-profiles/metrics-aggregated.yml → .../metrics-profiles/metrics-aggregated.yaml
diff --git a/.../kube-burner/metrics-profiles/metrics.yml → ...kube-burner/metrics-profiles/metrics.yaml b/.../kube-burner/metrics-profiles/metrics.yml → ...kube-burner/metrics-profiles/metrics.yaml
diff --git a/workloads/kube-burner/run_clusterdensity_test_fromgit.sh b/workloads/kube-burner/run_clusterdensity_test_fromgit.sh
@@ -3,7 +3,7 @@
 set -e
 
 WORKLOAD_TEMPLATE=workloads/cluster-density/cluster-density.yml
-METRICS_PROFILE=${METRICS_PROFILE:-metrics-profiles/metrics-aggregated.yml}
+METRICS_PROFILE=${METRICS_PROFILE:-metrics-profiles/metrics-aggregated.yaml}
 export TEST_JOB_ITERATIONS=${JOB_ITERATIONS:-1000}
 export WORKLOAD=cluster-density
 

diff --git a/workloads/kube-burner/run_maxnamespaces_test_fromgit.sh b/workloads/kube-burner/run_maxnamespaces_test_fromgit.sh
@@ -3,7 +3,7 @@
 set -e
 
 WORKLOAD_TEMPLATE=workloads/max-namespaces/max-namespaces.yml
-METRICS_PROFILE=${METRICS_PROFILE:-metrics-profiles/metrics-aggregated.yml}
+METRICS_PROFILE=${METRICS_PROFILE:-metrics-profiles/metrics-aggregated.yaml}
 export TEST_JOB_ITERATIONS=${NAMESPACE_COUNT:-1000}
 export WORKLOAD=max-namespaces
 

diff --git a/workloads/kube-burner/run_maxservices_test_fromgit.sh b/workloads/kube-burner/run_maxservices_test_fromgit.sh
@@ -3,7 +3,7 @@
 set -e
 
 WORKLOAD_TEMPLATE=workloads/max-services/max-services.yml
-METRICS_PROFILE=${METRICS_PROFILE:-metrics-profiles/metrics-aggregated.yml}
+METRICS_PROFILE=${METRICS_PROFILE:-metrics-profiles/metrics-aggregated.yaml}
 export TEST_JOB_ITERATIONS=${SERVICE_COUNT:-1000}
 export WORKLOAD=max-services
 

diff --git a/workloads/kube-burner/run_nodedensity-heavy_test_fromgit.sh b/workloads/kube-burner/run_nodedensity-heavy_test_fromgit.sh
@@ -3,7 +3,7 @@
 set -e
 
 WORKLOAD_TEMPLATE=workloads/node-density-heavy/node-density-heavy.yml
-METRICS_PROFILE=${METRICS_PROFILE:-metrics-profiles/metrics.yml}
+METRICS_PROFILE=${METRICS_PROFILE:-metrics-profiles/metrics.yaml}
 NODE_COUNT=${NODE_COUNT:-4}
 PODS_PER_NODE=${PODS_PER_NODE:-250}
 export WORKLOAD=node-density-heavy

diff --git a/workloads/kube-burner/run_nodedensity_test_fromgit.sh b/workloads/kube-burner/run_nodedensity_test_fromgit.sh
@@ -3,7 +3,7 @@
 set -e
 
 WORKLOAD_TEMPLATE=workloads/node-pod-density/node-pod-density.yml
-METRICS_PROFILE=${METRICS_PROFILE:-metrics-profiles/metrics.yml}
+METRICS_PROFILE=${METRICS_PROFILE:-metrics-profiles/metrics.yaml}
 NODE_COUNT=${NODE_COUNT:-4}
 PODS_PER_NODE=${PODS_PER_NODE:-250}
 export WORKLOAD=node-density

diff --git a/workloads/kube-burner/run_poddensity-heavy_test_fromgit.sh b/workloads/kube-burner/run_poddensity-heavy_test_fromgit.sh
@@ -3,7 +3,7 @@
 set -e
 
 WORKLOAD_TEMPLATE=workloads/node-density-heavy/node-density-heavy.yml
-METRICS_PROFILE=${METRICS_PROFILE:-metrics-profiles/metrics.yml}
+METRICS_PROFILE=${METRICS_PROFILE:-metrics-profiles/metrics.yaml}
 export TEST_JOB_ITERATIONS=${PODS:-1000}
 export WORKLOAD=pod-density-heavy
 

diff --git a/workloads/kube-burner/run_poddensity_test_fromgit.sh b/workloads/kube-burner/run_poddensity_test_fromgit.sh
@@ -3,7 +3,7 @@
 set -e
 
 WORKLOAD_TEMPLATE=workloads/node-pod-density/node-pod-density.yml
-METRICS_PROFILE=${METRICS_PROFILE:-metrics-profiles/metrics.yml}
+METRICS_PROFILE=${METRICS_PROFILE:-metrics-profiles/metrics.yaml}
 export TEST_JOB_ITERATIONS=${PODS:-1000}
 export WORKLOAD=pod-density