diff --git a/.github/cloudRun/cloud-tests-local-trigger.sh b/.github/cloudRun/cloud-tests-local-trigger.sh index a2ce7f43d0..5b6e696d12 100644 --- 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" /dev/null; then diff --git a/.github/weeklyBenchScripts/00_installRust.sh b/.github/weeklyBenchScripts/00_installRust.sh index b5ed6a084d..51fd45b5e6 100644 --- 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 index 4c84c902b1..cb1fbf03c2 100644 --- 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 index 61e2db729c..f2964fec4f 100644 --- 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 index 1ce7332317..2bfe80c279 100644 --- 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 index fc0a94ff5c..8eb1b9fe7e 100644 --- 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 index 48a3567164..5f11fc480a 100644 --- 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 index d7caf29546..80d99078e1 100644 --- 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 index 4b6656d831..160c16d714 100644 --- 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 index 3fdd05c7f1..2421e8774f 100755 --- a/.github/weeklyBenchScripts/08_processResults.sh +++ b/.github/weeklyBenchScripts/08_processResults.sh @@ -1,37 +1,37 @@ #!/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" < $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 index 4cd3879f9c..5ee06902e0 100644 --- 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 index 756768a358..8f105e99b2 100755 --- 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" /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" > cpu.stats -sadf -s $1 -d -- -r >> mem.stats +sadf -s "$1" -d >> cpu.stats +sadf -s "$1" -d -- -r >> mem.stats