Skip to content

Commit

Permalink
fix bug in run-script
Browse files Browse the repository at this point in the history
1. Fix the logic supporting relative paths of
   src_dir, gcsfuse_src_dir, csi_src_dir etc.
2. Fix the logging and checking of the above
   paths existing.
  • Loading branch information
gargnitingoogle committed Aug 22, 2024
1 parent d008a84 commit 5658c8e
Showing 1 changed file with 27 additions and 6 deletions.
33 changes: 27 additions & 6 deletions perfmetrics/scripts/testing_on_gke/examples/run-gke-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -127,28 +127,48 @@ export appnamespace=${DEFAULT_APPNAMESPACE}
# test -n "${ksa}" ||
export ksa=${DEFAULT_KSA}
test -n "${use_custom_csi_driver}" || export use_custom_csi_driver="${DEFAULT_USE_CUSTOM_CSI_DRIVER}"

# GCSFuse/GKE GCSFuse CSI Driver source code related
(test -n "${src_dir}" && src_dir="$(realpath "${src_dir}")") || export src_dir=${DEFAULT_SRC_DIR}
test -d "${src_dir}" || mkdir -pv "${src_dir}"
(test -n "${gcsfuse_src_dir}" && gcsfuse_src_dir="$(realpath "${gcsfuse_src_dir}")") || export gcsfuse_src_dir="${src_dir}"/gcsfuse
if test -n "${src_dir}"; then
test -d "${src_dir}"
export src_dir="$(realpath "${src_dir}")"
else
export src_dir=${DEFAULT_SRC_DIR}
mkdir -pv "${src_dir}"
fi

if test -n "${gcsfuse_src_dir}"; then
test -d "${gcsfuse_src_dir}"
export gcsfuse_src_dir="$(realpath "${gcsfuse_src_dir}")"
else
export gcsfuse_src_dir="${src_dir}"/gcsfuse
fi

export gke_testing_dir="${gcsfuse_src_dir}"/perfmetrics/scripts/testing_on_gke
(test -n "${csi_src_dir}" && csi_src_dir="$(realpath "${csi_src_dir}")") || export csi_src_dir="${src_dir}"/gcs-fuse-csi-driver

if test -n "${csi_src_dir}"; then
test -d "${csi_src_dir}"
export csi_src_dir="$(realpath "${csi_src_dir}")"
else
export csi_src_dir="${src_dir}"/gcs-fuse-csi-driver
fi

# GCSFuse configuration related
test -z "${gcsfuse_mount_options}" || (echo "gcsfuse_mount_options set by user is a deprecated option. Please set gcsfuseMountOptions in workload objects in workload configuration file in its place." && exit 1)
# 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}"
export workload_config="$(realpath "${workload_config}")"
else
export workload_config="${gke_testing_dir}"/examples/workloads.json
fi

if test -n "${output_dir}"; then
output_dir="$(realpath "${output_dir}")"
test -d "${output_dir}"
export output_dir="$(realpath "${output_dir}")"
else
export output_dir="${gke_testing_dir}"/examples
fi
Expand All @@ -173,6 +193,7 @@ function printRunParameters() {
echo "src_dir=\"${src_dir}\""
echo "gcsfuse_src_dir=\"${gcsfuse_src_dir}\""
echo "csi_src_dir=\"${csi_src_dir}\""
echo "gke_testing_dir=\"${gke_testing_dir}\""
# Test runtime configuration
echo "pod_wait_time_in_seconds=\"${pod_wait_time_in_seconds}\""
echo "instance_id=\"${instance_id}\""
Expand Down

0 comments on commit 5658c8e

Please sign in to comment.