PR changes

taikoxyz · Sep 7, 2023 · 952dda6 · 952dda6
1 parent 1ac51f9
commit 952dda6
Show file tree

Hide file tree

Showing 22 changed files with 88 additions and 66 deletions.
diff --git a/.github/cloudRun/cloud-tests-local-trigger.sh b/.github/cloudRun/cloud-tests-local-trigger.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+set -eo pipefail
+
 cd "$(dirname "$0")" || exit 1
 
 GITHUB_RUN_ID=$1
@@ -13,24 +15,24 @@ echo "Prover IP: $PROVER_IP"
 rm ~/.ssh/known_hosts*
 
 prepare_env() {
-  ssh -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@$PROVER_IP "bash -s" -- <../weeklyBenchScripts/00_installGo.sh
-  ssh -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@$PROVER_IP "bash -s" -- <../weeklyBenchScripts/00_installRust.sh
-  ssh -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@$PROVER_IP "bash -s" -- <../weeklyBenchScripts/01_installDeps.sh
-  ssh -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@$PROVER_IP "bash -s" -- <../weeklyBenchScripts/02_setup.sh
+  ssh -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@"$PROVER_IP" "bash -s" -- <../weeklyBenchScripts/00_installGo.sh
+  ssh -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@"$PROVER_IP" "bash -s" -- <../weeklyBenchScripts/00_installRust.sh
+  ssh -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@"$PROVER_IP" "bash -s" -- <../weeklyBenchScripts/01_installDeps.sh
+  ssh -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@"$PROVER_IP" "bash -s" -- <../weeklyBenchScripts/02_setup.sh
 }
 
 prepare_repo() {
-  ssh -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@$PROVER_IP "bash -s" -- "$GITHUB_RUN_ID" <../weeklyBenchScripts/03_prepareProver.sh
-  ssh -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@$PROVER_IP "bash -s" -- "$GITHUB_RUN_ID" "$BRANCH_NAME" <../weeklyBenchScripts/04_clone.sh
-  ssh -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@$PROVER_IP "bash -s" -- "$GITHUB_RUN_ID" <../weeklyBenchScripts/05_build.sh
+  ssh -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@"$PROVER_IP" "bash -s" -- "$GITHUB_RUN_ID" <../weeklyBenchScripts/03_prepareProver.sh
+  ssh -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@"$PROVER_IP" "bash -s" -- "$GITHUB_RUN_ID" "$BRANCH_NAME" <../weeklyBenchScripts/04_clone.sh
+  ssh -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@"$PROVER_IP" "bash -s" -- "$GITHUB_RUN_ID" <../weeklyBenchScripts/05_build.sh
 
 }
 
 prepare_env
 prepare_repo
 
-ssh -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@$PROVER_IP "bash -s" -- "$GITHUB_RUN_ID" <run.sh
-scp -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@$PROVER_IP:"$HOME"/CI_Prover_Benches/"$GITHUB_RUN_ID"/run_result ../../../
+ssh -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@"$PROVER_IP" "bash -s" -- "$GITHUB_RUN_ID" <run.sh
+scp -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@"$PROVER_IP":"$HOME"/CI_Prover_Benches/"$GITHUB_RUN_ID"/run_result ../../../
 RESULT=$(cat ../../../run_result)
 echo "exiting cloud-tests-local-trigger with RESULT $RESULT"
-exit $RESULT
+exit "$RESULT"
diff --git a/.github/cloudRun/cloud-tests-trigger.sh b/.github/cloudRun/cloud-tests-trigger.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+set -eo pipefail
+
 GITHUB_RUN_ID=$1
 BRANCH_NAME=$2
 
@@ -17,19 +19,19 @@ ensure_git_installed
 clone_zkevm-circuits() {
   git clone -q https://github.com/taikoxyz/zkevm-circuits.git
   cd zkevm-circuits || exit 1
-  git checkout $BRANCH_NAME
+  git checkout "$BRANCH_NAME"
   echo "Cloned zkevm-circuits"
 }
 
 directory_name="$HOME/CI_Github_Trigger/$GITHUB_RUN_ID"
-cd $directory_name || exit 1
+cd "$directory_name" || exit 1
 
 
 clone_zkevm-circuits
 
 cd .github/cloudRun || exit 1
 chmod u+x cloud-tests-local-trigger.sh
-./cloud-tests-local-trigger.sh $GITHUB_RUN_ID $BRANCH_NAME
+./cloud-tests-local-trigger.sh "$GITHUB_RUN_ID" "$BRANCH_NAME"
 RESULT=$?
 echo "exiting cloud-tests-trigger with result $RESULT"
 exit $RESULT
diff --git a/.github/cloudRun/github-action-trigger.sh b/.github/cloudRun/github-action-trigger.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
+set -eo pipefail
 
-sshpass -p $BENCH_RESULTS_PASS ssh -o StrictHostKeyChecking=no ubuntu@43.130.90.57 "bash -s" -- "$GITHUB_RUN_ID" "$BRANCH_NAME" <cloud-tests-trigger.sh
+sshpass -p "$BENCH_RESULTS_PASS" ssh -o StrictHostKeyChecking=no ubuntu@43.130.90.57 "bash -s" -- "$GITHUB_RUN_ID" "$BRANCH_NAME" <cloud-tests-trigger.sh
 RESULT=$?
 echo "exiting github-action-trigger with RESULT=$RESULT"
 exit $RESULT
diff --git a/.github/cloudRun/run.sh b/.github/cloudRun/run.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+set -eo pipefail
+
 GITHUB_RUN_ID=$1
 export GOROOT="/usr/local/go"
 export GOPATH="$HOME/go"
@@ -9,7 +11,7 @@ current_dir="$HOME"/CI_Prover_Benches/"$GITHUB_RUN_ID"
 
 target_dir="$current_dir/zkevm-circuits"
 
-cd $target_dir || exit 1
+cd "$target_dir" || exit 1
 
 # ENTER YOUR TEST COMMAND BELOW
 make test-all

diff --git a/.github/weeklyBenchScripts/00_installGo.sh b/.github/weeklyBenchScripts/00_installGo.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -eo pipefail
 
 # Check if Go is already installed
 if command -v go &>/dev/null; then

diff --git a/.github/weeklyBenchScripts/00_installRust.sh b/.github/weeklyBenchScripts/00_installRust.sh
@@ -1,10 +1,11 @@
 #!/bin/bash
+set -eo pipefail
 
 # Check if rustup is already installed
 if ! command -v rustup &>/dev/null; then
     echo "Installing rustup..."
     curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-    source $HOME/.cargo/env
+    source "$HOME"/.cargo/env
 else
     echo "rustup is already installed. Checking for updates..."
     rustup update

diff --git a/.github/weeklyBenchScripts/01_installDeps.sh b/.github/weeklyBenchScripts/01_installDeps.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+set -eo pipefail
+
 sudo apt update
 
 # Check if Git is already installed

diff --git a/.github/weeklyBenchScripts/02_setup.sh b/.github/weeklyBenchScripts/02_setup.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -eo pipefail
 
 # Function to check if sysstat is installed
 check_sysstat_installed() {

diff --git a/.github/weeklyBenchScripts/03_prepareProver.sh b/.github/weeklyBenchScripts/03_prepareProver.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -eo pipefail
 
 GITHUB_RUN_ID=$1
 

diff --git a/.github/weeklyBenchScripts/04_clone.sh b/.github/weeklyBenchScripts/04_clone.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -eo pipefail
 
 GITHUB_RUN_ID=$1
 

diff --git a/.github/weeklyBenchScripts/05_build.sh b/.github/weeklyBenchScripts/05_build.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+set -eo pipefail
+
 GITHUB_RUN_ID=$1
 
 export GOROOT="/usr/local/go"

diff --git a/.github/weeklyBenchScripts/06_rsSysstat.sh b/.github/weeklyBenchScripts/06_rsSysstat.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
-#set -e
-#set -x
+set -eo pipefail
+
 echo "Killing sadc"
 sudo pkill sadc
 echo "Cleaning /var/log/sysstat"

diff --git a/.github/weeklyBenchScripts/07_execBench.sh b/.github/weeklyBenchScripts/07_execBench.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
-set -e
-#set -x
+set -eo pipefail
+
 GITHUB_RUN_ID=$3
 export GOROOT="/usr/local/go"
 export GOPATH="$HOME/go"
@@ -11,7 +11,7 @@ current_dir="$HOME"/CI_Prover_Benches/"$GITHUB_RUN_ID"
 
 target_dir="$current_dir/zkevm-circuits"
 k=$1
-circuit=$(echo $2 | awk '{ print $1 }' | tr '[:upper:]' '[:lower:]')
+circuit=$(echo "$2" | awk '{ print $1 }' | tr '[:upper:]' '[:lower:]')
 printf -v _date '%(%Y-%m-%d_%H:%M:%S)T' -1
 
 case $circuit in
@@ -52,17 +52,14 @@ case $circuit in
         ;;
 esac
 
-cd $target_dir;
+cd "$target_dir";
 
 mkdir ../results
-logfile=$_date--${circuit}_bench-$k.proverlog
+logfile="$_date"--"${circuit}"_bench-"$k".proverlog
 
 current_time=$(date +'%H:%M:%S')
 echo "Current time: $current_time"
-echo $current_time > ~/bench_begin
+echo "$current_time" > ~/bench_begin
 export RUST_BACKTRACE=1
 echo "DEGREE=$k ~/.cargo/bin/cargo test --profile bench bench_${run_suffix} -p circuit-benchmarks --features benches  -- --nocapture > \"$target_dir/results/$logfile\" 2>&1"
 DEGREE=$k ~/.cargo/bin/cargo test --profile bench bench_${run_suffix} -p circuit-benchmarks --features benches  -- --nocapture > "$target_dir/../results/$logfile" 2>&1
-
-
-exit 0
diff --git a/.github/weeklyBenchScripts/08_processResults.sh b/.github/weeklyBenchScripts/08_processResults.sh
@@ -1,55 +1,55 @@
 #!/bin/bash
-set -e
-#set -x
+set -eo pipefail
 
 label=$1
 degree=$2
 
 # Get the latest temp directory in the Triggerers directory
 trigger_results_dir="../../../results/$label"
-mkdir -p $trigger_results_dir || true
+mkdir -p "$trigger_results_dir" || true
 
 # Get the latest temp directory in the Provers home directory
-prover_latest_dir=$(ssh -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@$PROVER_IP "bash -s" <<EOF
+prover_latest_dir=$(ssh -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@"$PROVER_IP" "bash -s" <<EOF
 ls -td -- "\$HOME"/CI_Prover_Benches/* | head -1
 EOF
 )
 
 prover_target_dir="$prover_latest_dir/zkevm-circuits"
 prover_results_dir="$prover_latest_dir/results"
-echo $prover_target_dir
+echo "$prover_target_dir"
 
 # Collect results from Prover
 echo "Collecting results from $PROVER_IP:$prover_results_dir to TRIGGER_HOST:$trigger_results_dir"
-scp -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@$PROVER_IP:$prover_results_dir/*proverlog $trigger_results_dir/
+scp -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@"$PROVER_IP":"$prover_results_dir"/*proverlog "$trigger_results_dir"/
 
 # Enable bash Environment Variables for Prover
-ssh -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@$PROVER_IP "bash -s" <<EOF
+ssh -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@"$PROVER_IP" "bash -s" <<EOF
 echo "PermitUserEnvironment yes" | sudo tee -a /etc/ssh/sshd_config
 sudo service sshd restart
 EOF
 sleep 10
 
 # Collect cpu and memory metrics
-scp -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ./sadf.sh ubuntu@$PROVER_IP:~/
+scp -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ./sadf.sh ubuntu@"$PROVER_IP":~/
+# shellcheck disable=SC2086
 ssh -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@$PROVER_IP "bash -s" <<EOF
 BENCH_BEGIN=\$(cat /home/ubuntu/bench_begin)
 echo "Bench began at \$BENCH_BEGIN"
 mv /home/ubuntu/sadf.sh $prover_results_dir/
 cd $prover_results_dir
 ./sadf.sh \$BENCH_BEGIN
 EOF
-scp -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@$PROVER_IP:$prover_results_dir/*.stats $trigger_results_dir/
+scp -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@"$PROVER_IP":"$prover_results_dir"/*.stats "$trigger_results_dir"/
 
 # Prepare for and run data processing and db persistence
 
-l=$(echo $label | tr -d '"')
-circuit=$(echo $l |  awk '{print $1}')
+l=$(echo "$label" | tr -d '"')
+circuit=$(echo "$l" |  awk '{print $1}')
 time=$(date +%Y-%m-%d_%H-%M-%S)
 test_id=$time-$circuit-$degree-Benchmark
 
-cd $trigger_results_dir
-tar -czvf ./$test_id.tar.gz ./*proverlog ./*.stats
+cd "$trigger_results_dir"
+tar -czvf ./"$test_id".tar.gz ./*proverlog ./*.stats
 
 cp ../../zkevm-circuits/.github/weeklyBenchScripts/reporting*.py .
 sudo cp *proverlog /var/www/www_logs/
@@ -58,8 +58,7 @@ sed -i '1i BENCH-PROVER;-1;UTC;LINUX-RESTART	(64 CPU)' mem.stats
 sed -i '1i BENCH-PROVER;-1;UTC;LINUX-RESTART	(64 CPU)' cpu.stats
 python3 reporting_main.py  "$proverlog" "1" "$circuit" "$degree" "$test_id"
 
-ssh -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@$PROVER_IP "bash -s" <<EOF
+ssh -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@"$PROVER_IP" "bash -s" <<EOF
 sudo rm -rf $prover_results_dir
 EOF
 
-exit 0
diff --git a/.github/weeklyBenchScripts/bench-results-cleanup.sh b/.github/weeklyBenchScripts/bench-results-cleanup.sh
@@ -1,10 +1,12 @@
 #!/bin/bash
+set -eo pipefail
+
 GITHUB_RUN_ID=$1
 echo "Performing cleanup... $GITHUB_RUN_ID"
 sleep 60
-PROVER_INSTANCE=$(cat $HOME/CI_Github_Trigger/$GITHUB_RUN_ID/prover_instance)
+PROVER_INSTANCE=$(cat "$HOME"/CI_Github_Trigger/"$GITHUB_RUN_ID"/prover_instance)
 echo "Prover instance at cleanup: $PROVER_INSTANCE"
 tccli cvm TerminateInstances --InstanceIds "[\"$PROVER_INSTANCE\"]" --ReleasePrepaidDataDisk True
 echo "Exiting bench-results-local-cleanup"
 rm -rf "$HOME/CI_Github_Trigger/$GITHUB_RUN_ID"
-exit 0
+
diff --git a/.github/weeklyBenchScripts/bench-results-local-trigger.sh b/.github/weeklyBenchScripts/bench-results-local-trigger.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+set -eo pipefail
+
 cd "$(dirname "$0")" || exit 1
 
 GITHUB_RUN_ID=$1
@@ -11,23 +13,23 @@ echo "Prover IP: $PROVER_IP"
 
 rm ~/.ssh/known_hosts*
 
-ssh -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@$PROVER_IP "bash -s" -- <00_installGo.sh
-ssh -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@$PROVER_IP "bash -s" -- <00_installRust.sh
-ssh -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@$PROVER_IP "bash -s" -- <01_installDeps.sh
-ssh -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@$PROVER_IP "bash -s" -- <02_setup.sh
+ssh -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@"$PROVER_IP" "bash -s" -- <00_installGo.sh
+ssh -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@"$PROVER_IP" "bash -s" -- <00_installRust.sh
+ssh -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@"$PROVER_IP" "bash -s" -- <01_installDeps.sh
+ssh -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@"$PROVER_IP" "bash -s" -- <02_setup.sh
 
 RESULT=""
 run_single_benchmark() {
   local DEGREE=$1
   local CIRCUIT=$2
 
-  ssh -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@$PROVER_IP "bash -s" -- "$GITHUB_RUN_ID" <03_prepareProver.sh
-  ssh -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@$PROVER_IP "bash -s" -- "$GITHUB_RUN_ID" <04_clone.sh
-  ssh -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@$PROVER_IP "bash -s" -- "$GITHUB_RUN_ID" <05_build.sh
-  ssh -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@$PROVER_IP "bash -s" -- <06_rsSysstat.sh &
+  ssh -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@"$PROVER_IP" "bash -s" -- "$GITHUB_RUN_ID" <03_prepareProver.sh
+  ssh -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@"$PROVER_IP" "bash -s" -- "$GITHUB_RUN_ID" <04_clone.sh
+  ssh -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@"$PROVER_IP" "bash -s" -- "$GITHUB_RUN_ID" <05_build.sh
+  ssh -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@"$PROVER_IP" "bash -s" -- <06_rsSysstat.sh &
   sleep 5
 
-  ssh -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@$PROVER_IP "bash -s" -- "$DEGREE" "$CIRCUIT" "$GITHUB_RUN_ID" <07_execBench.sh
+  ssh -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@"$PROVER_IP" "bash -s" -- "$DEGREE" "$CIRCUIT" "$GITHUB_RUN_ID" <07_execBench.sh
   declare -g RESULT=$?
   chmod u+x 08_processResults.sh
   ./08_processResults.sh "$CIRCUIT" "$DEGREE"

diff --git a/.github/weeklyBenchScripts/bench-results-setup.sh b/.github/weeklyBenchScripts/bench-results-setup.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+set -eo pipefail
+
 GITHUB_RUN_ID=$1
 
 make_temp_dir() {
@@ -21,8 +23,7 @@ make_temp_dir
 PROVER_INSTANCE=$(tccli cvm RunInstances --InstanceChargeType POSTPAID_BY_HOUR --InstanceChargePrepaid '{"Period":1,"RenewFlag":"DISABLE_NOTIFY_AND_MANUAL_RENEW"}' --Placement '{"Zone":"na-toronto-1"}' --InstanceType S3.16XLARGE256 --ImageId img-487zeit5 --SystemDisk '{"DiskType":"CLOUD_BSSD", "DiskSize":80}' --InternetAccessible '{"InternetChargeType":"TRAFFIC_POSTPAID_BY_HOUR","InternetMaxBandwidthOut":10,"PublicIpAssigned":true}' --InstanceCount 1 --InstanceName BENCH-PROVER --LoginSettings '{"KeyIds":[ "skey-au79yarf" ]}' --SecurityGroupIds '["sg-c3jtjz5g"]' --HostName BENCH-PROVER | egrep -o ins-[0-9a-zA-Z]*)
 #PROVER_INSTANCE=$(tccli cvm RunInstances --InstanceChargeType POSTPAID_BY_HOUR --InstanceChargePrepaid '{"Period":1,"RenewFlag":"DISABLE_NOTIFY_AND_MANUAL_RENEW"}' --Placement '{"Zone":"eu-frankfurt"}' --InstanceType S5.16XLARGE256 --ImageId img-487zeit5 --SystemDisk '{"DiskType":"CLOUD_BSSD", "DiskSize":80}' --InternetAccessible '{"InternetChargeType":"TRAFFIC_POSTPAID_BY_HOUR","InternetMaxBandwidthOut":10,"PublicIpAssigned":true}' --InstanceCount 1 --InstanceName BENCH-PROVER --LoginSettings '{"KeyIds":[ "skey-au79yarf" ]}' --SecurityGroupIds '["sg-ajrlphkl"]' --HostName BENCH-PROVER | egrep -o ins-[0-9a-zA-Z]*)
 #PROVER_INSTANCE=$(tccli cvm RunInstances --InstanceChargeType POSTPAID_BY_HOUR --InstanceChargePrepaid '{"Period":1,"RenewFlag":"DISABLE_NOTIFY_AND_MANUAL_RENEW"}' --Placement '{"Zone":"na-ashburn-2"}' --InstanceType S3.MEDIUM2 --ImageId img-487zeit5 --SystemDisk '{"DiskType":"CLOUD_BSSD", "DiskSize":50}' --InternetAccessible '{"InternetChargeType":"TRAFFIC_POSTPAID_BY_HOUR","InternetMaxBandwidthOut":10,"PublicIpAssigned":true}' --InstanceCount 1 --InstanceName BENCH-PROVER --LoginSettings '{"KeyIds":[ "skey-au79yarf" ]}' --SecurityGroupIds '["sg-ajrlphkl"]' --HostName BENCH-PROVER | egrep -o ins-[0-9a-zA-Z]*)
-echo "$PROVER_INSTANCE" > $HOME/CI_Github_Trigger/$GITHUB_RUN_ID/prover_instance
+echo "$PROVER_INSTANCE" > "$HOME"/CI_Github_Trigger/"$GITHUB_RUN_ID"/prover_instance
 echo "Prover instance at trigger: "
-cat $HOME/CI_Github_Trigger/$GITHUB_RUN_ID/prover_instance
+cat "$HOME"/CI_Github_Trigger/"$GITHUB_RUN_ID"/prover_instance
 sleep 60
-exit 0
diff --git a/.github/weeklyBenchScripts/bench-results-trigger.sh b/.github/weeklyBenchScripts/bench-results-trigger.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+set -eo pipefail
+
 GITHUB_RUN_ID=$1
 
 ensure_git_installed() {
@@ -18,14 +20,14 @@ clone_zkevm-circuits() {
 }
 
 directory_name="$HOME/CI_Github_Trigger/$GITHUB_RUN_ID"
-cd $directory_name || exit 1
+cd "$directory_name" || exit 1
 
 ensure_git_installed
 clone_zkevm-circuits
 
 cd .github/weeklyBenchScripts || exit 1
 chmod u+x bench-results-local-trigger.sh
-./bench-results-local-trigger.sh $GITHUB_RUN_ID
+./bench-results-local-trigger.sh "$GITHUB_RUN_ID"
 RESULT=$?
 echo "Exiting bench-results-trigger with RESULT $RESULT"
 exit $RESULT
diff --git a/.github/weeklyBenchScripts/github-action-cleanup.sh b/.github/weeklyBenchScripts/github-action-cleanup.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
+set -eo pipefail
 
 echo "Triggering cleanup"
-sshpass -p $BENCH_RESULTS_PASS ssh -o StrictHostKeyChecking=no ubuntu@43.130.90.57  "bash -s" -- "$GITHUB_RUN_ID" <bench-results-cleanup.sh
+sshpass -p "$BENCH_RESULTS_PASS" ssh -o StrictHostKeyChecking=no ubuntu@43.130.90.57  "bash -s" -- "$GITHUB_RUN_ID" <bench-results-cleanup.sh
 
 echo "Exiting github-action-cleanup"
-exit 0
diff --git a/.github/weeklyBenchScripts/github-action-setup.sh b/.github/weeklyBenchScripts/github-action-setup.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+set -eo pipefail
+
 ensure_ssh_and_sshpass_installed() {
   # Check if 'ssh' is installed
   if ! command -v ssh &>/dev/null; then
@@ -22,7 +24,6 @@ ensure_ssh_and_sshpass_installed() {
 ensure_ssh_and_sshpass_installed
 
 echo "Triggering setup"
-sshpass -p $BENCH_RESULTS_PASS ssh -o StrictHostKeyChecking=no ubuntu@43.130.90.57  "bash -s" -- "$GITHUB_RUN_ID" <bench-results-setup.sh
+sshpass -p "$BENCH_RESULTS_PASS" ssh -o StrictHostKeyChecking=no ubuntu@43.130.90.57  "bash -s" -- "$GITHUB_RUN_ID" <bench-results-setup.sh
 
 echo "Exiting github-action-setup"
-exit 0