Fix hog scenarios to use the correct configuration file

Signed-off-by: Naga Ravi Chaitanya Elluri <[email protected]>
redhat-chaos · Jul 5, 2024 · 7b39a04 · 7b39a04
1 parent c9d4b96
commit 7b39a04
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 18 deletions.
diff --git a/cpu-hog/prow_run.sh b/cpu-hog/prow_run.sh
@@ -15,19 +15,14 @@ SCENARIO_FOLDER="$krkn_loc/scenarios/arcaflow/cpu-hog"
 echo "Printing cluster version"
 oc version
 
-# Copy config to kraken
-cp node-cpu-hog/input.yaml.template $SCENARIO_FOLDER/input.yaml.template
-
 source node-cpu-hog/env.sh
-source env.sh
 source common_run.sh
 
+envsubst < node-cpu-hog/input.yaml.template> $SCENARIO_FOLDER/input.yaml.template
 setup_arcaflow_env "$SCENARIO_FOLDER"
 checks
 
 # Substitute config with environment vars defined
-#envsubst < node-cpu-hog/input.yaml.template> node-cpu-hog/cpu_hog_scenario.yaml
-#export SCENARIO_FILE="node-cpu-hog/cpu_hog_scenario.yaml"
 export SCENARIO_FILE="$SCENARIO_FOLDER/input.yaml"
 envsubst < config.yaml.template > $krkn_loc/cpu_hog_config.yaml
 

diff --git a/io-hog/prow_run.sh b/io-hog/prow_run.sh
@@ -15,19 +15,14 @@ SCENARIO_FOLDER="$krkn_loc/scenarios/arcaflow/io-hog"
 echo "Printing cluster version"
 oc version
 
-# Copy config to kraken
-cp node-io-hog/input.yaml.template $SCENARIO_FOLDER/input.yaml.template
-
 source node-io-hog/env.sh
-source env.sh
 source common_run.sh
 
+envsubst < node-io-hog/input.yaml.template> $SCENARIO_FOLDER/input.yaml
 setup_arcaflow_env "$SCENARIO_FOLDER"
 checks
 
 # Substitute config with environment vars defined
-#envsubst < node-io-hog/input.yaml.template> node-io-hog/io_hog_scenario.yaml
-#export SCENARIO_FILE="node-io-hog/io_hog_scenario.yaml"
 export SCENARIO_FILE="$SCENARIO_FOLDER/input.yaml"
 envsubst < config.yaml.template > $krkn_loc/io_hog_config.yaml
 

diff --git a/memory-hog/prow_run.sh b/memory-hog/prow_run.sh
@@ -15,19 +15,14 @@ SCENARIO_FOLDER="$krkn_loc/scenarios/arcaflow/memory-hog"
 echo "Printing cluster version"
 oc version
 
-# Copy config to kraken
-cp node-memory-hog/input.yaml.template $SCENARIO_FOLDER/input.yaml.template 
-
 source node-memory-hog/env.sh
-source env.sh
 source common_run.sh
 
+envsubst < node-memory-hog/input.yaml.template> $SCENARIO_FOLDER/input.yaml.template
 setup_arcaflow_env "$SCENARIO_FOLDER"
 checks
 
 # Substitute config with environment vars defined
-#envsubst < node-memory-hog/input.yaml.template> node-memory-hog/memory_hog_scenario.yaml
-#export SCENARIO_FILE="node-memory-hog/memory_hog_scenario.yaml"
 export SCENARIO_FILE="$SCENARIO_FOLDER/input.yaml"
 envsubst < config.yaml.template > $krkn_loc/memory_hog_config.yaml