From eead41d50c631df1f659e2206eaaa0dab008cad3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Vonheiden?= <bjoern.vonheiden@hotmail.de>
Date: Mon, 8 Jun 2020 16:22:09 +0200
Subject: [PATCH] Fix pathes for kustomize patches and calculate execution time

The pathes for the kustomize patch files were wrong in the shell
scripts and therefore running was not correct.
Further the execution time of the usecases should by calculated
because the m flag for sleep is not supported on macOS.
---
 execution/run_uc1-new.sh | 2 +-
 execution/run_uc2-new.sh | 4 ++--
 execution/run_uc3-new.sh | 4 ++--
 execution/run_uc4-new.sh | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/execution/run_uc1-new.sh b/execution/run_uc1-new.sh
index ee981554d..a598a9587 100755
--- a/execution/run_uc1-new.sh
+++ b/execution/run_uc1-new.sh
@@ -72,7 +72,7 @@ kubectl apply -k uc-application/overlay/uc1-application
 kubectl scale deployment uc1-titan-ccp-aggregation --replicas=$REPLICAS
 
 # Execute for certain time
-sleep ${EXECUTION_MINUTES}m
+sleep $(($EXECUTION_MINUTES * 60))
 
 # Run eval script
 source ../.venv/bin/activate
diff --git a/execution/run_uc2-new.sh b/execution/run_uc2-new.sh
index 052c8ba5c..a52dd9c1d 100755
--- a/execution/run_uc2-new.sh
+++ b/execution/run_uc2-new.sh
@@ -45,7 +45,7 @@ kubectl apply -k uc2-workload-generator
 
 # Start application
 REPLICAS=$INSTANCES
-cat <<EOF >uc-application/overlay/uc1-application/set_paramters.yaml
+cat <<EOF >uc-application/overlay/uc2-application/set_paramters.yaml
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -67,7 +67,7 @@ kubectl apply -k uc-application/overlay/uc2-application
 kubectl scale deployment uc2-titan-ccp-aggregation --replicas=$REPLICAS
 
 # Execute for certain time
-sleep ${EXECUTION_MINUTES}m
+sleep $(($EXECUTION_MINUTES * 60))
 
 # Run eval script
 source ../.venv/bin/activate
diff --git a/execution/run_uc3-new.sh b/execution/run_uc3-new.sh
index 85712030e..33549d676 100755
--- a/execution/run_uc3-new.sh
+++ b/execution/run_uc3-new.sh
@@ -73,7 +73,7 @@ kubectl apply -k uc-application/overlay/uc3-application
 kubectl scale deployment uc3-titan-ccp-aggregation --replicas=$REPLICAS
 
 # Execute for certain time
-sleep ${EXECUTION_MINUTES}m
+sleep $(($EXECUTION_MINUTES * 60))
 
 # Run eval script
 source ../.venv/bin/activate
@@ -81,7 +81,7 @@ python lag_analysis.py $EXP_ID uc3 $DIM_VALUE $INSTANCES $EXECUTION_MINUTES
 deactivate
 
 # Stop workload generator and app
-kubectl delete -k uc1-workload-generator
+kubectl delete -k uc3-workload-generator
 kubectl delete -k uc-application/overlay/uc3-application
 
 # Delete topics instead of Kafka
diff --git a/execution/run_uc4-new.sh b/execution/run_uc4-new.sh
index 8f44d7247..13f814315 100755
--- a/execution/run_uc4-new.sh
+++ b/execution/run_uc4-new.sh
@@ -45,7 +45,7 @@ kubectl apply -k uc4-workload-generator
 
 # Start application
 REPLICAS=$INSTANCES
-cat <<EOF >uc-application/overlay/uc1-application/set_paramters.yaml
+cat <<EOF >uc-application/overlay/uc4-application/set_paramters.yaml
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -67,7 +67,7 @@ kubectl apply -k uc-application/overlay/uc4-application
 kubectl scale deployment uc4-titan-ccp-aggregation --replicas=$REPLICAS
 
 # Execute for certain time
-sleep ${EXECUTION_MINUTES}m
+sleep $(($EXECUTION_MINUTES * 60))
 
 # Run eval script
 source ../.venv/bin/activate
-- 
GitLab