From 20e38a7b360c67b12de49d91059c1d33390b5439 Mon Sep 17 00:00:00 2001
From: Nitin Garg <gargnitin@google.com>
Date: Mon, 19 Aug 2024 11:54:52 +0000
Subject: [PATCH] Fixes for run on gce vm

Don't create package bucket with google in name
ignore FileNotFoundError for mash not installed
---
 perfmetrics/scripts/testing_on_gke/examples/run-gke-tests.sh | 5 +++--
 perfmetrics/scripts/testing_on_gke/examples/utils/utils.py   | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/perfmetrics/scripts/testing_on_gke/examples/run-gke-tests.sh b/perfmetrics/scripts/testing_on_gke/examples/run-gke-tests.sh
index 001fad7f60..1f632ded97 100755
--- a/perfmetrics/scripts/testing_on_gke/examples/run-gke-tests.sh
+++ b/perfmetrics/scripts/testing_on_gke/examples/run-gke-tests.sh
@@ -131,6 +131,7 @@ test -z "${gcsfuse_mount_options}" || (echo "gcsfuse_mount_options set by user i
 # Test runtime configuration
 test -n "${pod_wait_time_in_seconds}" || export pod_wait_time_in_seconds="${DEFAULT_POD_WAIT_TIME_IN_SECONDS}"
 test -n "${instance_id}" || export instance_id="${DEFAULT_INSTANCE_ID}"
+
 if test -n "${workload_config}"; then
   workload_config="$(realpath "${workload_config}")"
   test -f "${workload_config}"
@@ -183,7 +184,7 @@ function installDependencies() {
   which python3
   # Ensure that make is installed.
   which make || (sudo apt-get update && sudo apt-get install -y make time)
-  # Ensure that go is installed
+  # Ensure that go is installed.
   which go || (version=1.22.4 && wget -O go_tar.tar.gz https://go.dev/dl/go${version}.linux-amd64.tar.gz 1>/dev/null && sudo rm -rf /usr/local/go && tar -xzf go_tar.tar.gz 1>/dev/null && sudo mv go /usr/local && echo $PATH && export PATH=$PATH:/usr/local/go/bin && echo $PATH && echo 'export PATH=$PATH:/usr/local/go/bin'>>~/.bashrc && go version)
   # for some reason, the above is unable to update the value of $PATH, so doing it explicitly below.
   export PATH=$PATH:/usr/local/go/bin
@@ -413,7 +414,7 @@ function createCustomCsiDriverIfNeeded() {
     echo "Building custom CSI driver ..."
 
     # Create a bucket for storing custom-csi driver.
-    test -n "${package_bucket}" || export package_bucket=${USER}-gcsfuse-binary-package
+    test -n "${package_bucket}" || export package_bucket=${USER/google/}-gcsfuse-binary-package
     (gcloud storage buckets list | grep -wqo ${package_bucket}) || (region=$(echo ${zone} | rev | cut -d- -f2- | rev) && gcloud storage buckets create gs://${package_bucket} --location=${region})
 
     # Build a new gcsfuse binary
diff --git a/perfmetrics/scripts/testing_on_gke/examples/utils/utils.py b/perfmetrics/scripts/testing_on_gke/examples/utils/utils.py
index 766a5c8a38..112b21180d 100644
--- a/perfmetrics/scripts/testing_on_gke/examples/utils/utils.py
+++ b/perfmetrics/scripts/testing_on_gke/examples/utils/utils.py
@@ -30,6 +30,8 @@ def is_mash_installed() -> bool:
     return True
   except subprocess.CalledProcessError:
     return False
+  except FileNotFoundError:
+    return False
 
 
 def get_memory(