[satlab]: Pin google/cloud-sdk version
Change-Id: I6521f47ed6d8f517040c676404004539fceb0538
Bug:b:225056053
Test: Manually tested on Satlab testbed
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/satlab/+/3531080
Reviewed-by: Anh Le <anhdle@chromium.org>
Commit-Queue: Prasad Vuppalapu <prasadv@chromium.org>
Tested-by: Prasad Vuppalapu <prasadv@chromium.org>
Auto-Submit: Prasad Vuppalapu <prasadv@chromium.org>
diff --git a/src/dockerfiles/satlab_remote_access/tools/satlab_setup b/src/dockerfiles/satlab_remote_access/tools/satlab_setup
index be1d768..1203f93 100755
--- a/src/dockerfiles/satlab_remote_access/tools/satlab_setup
+++ b/src/dockerfiles/satlab_remote_access/tools/satlab_setup
@@ -31,7 +31,9 @@
SATLAB_SERIVCE_ACCOUNT=satlab-prototype@chromeos-service-accounts-dev.iam.gserviceaccount.com
KEYS_FOLDER=/home/satlab/keys
-GCLOUD="docker run --rm -ti -a stdout -v satlab_keys:${KEYS_FOLDER} -v gcloud:/root/.config/gcloud google/cloud-sdk:slim"
+# TODO(prasadv): Move this to environment variable
+GCLOUD_SDK_VERSION=372.0.0
+GCLOUD="docker run --rm -ti -a stdout -v satlab_keys:${KEYS_FOLDER} -v gcloud:/root/.config/gcloud google/cloud-sdk:${GCLOUD_SDK_VERSION}-slim"
echo "******* SATLAB Setup Starting..... *********"
echo
diff --git a/src/dockerfiles/satlab_remote_access/tools/service_account_key_check.sh b/src/dockerfiles/satlab_remote_access/tools/service_account_key_check.sh
index fba24a5..55a807f 100644
--- a/src/dockerfiles/satlab_remote_access/tools/service_account_key_check.sh
+++ b/src/dockerfiles/satlab_remote_access/tools/service_account_key_check.sh
@@ -1,6 +1,7 @@
KEY_FOLDER='/home/satlab/keys'
KEY_FILE='satlab_service_account.json'
-
+# TODO(prasadv): Move this to environment variable
+GCLOUD_SDK_VERSION=372.0.0
if [ -f "$KEY_FOLDER/$KEY_FILE" ]; then
cat << EOF
###############################################################################
@@ -9,7 +10,7 @@
###############################################################################
EOF
key_id=$(sudo jq -r '."private_key_id"' $KEY_FOLDER/$KEY_FILE)
- GCLOUD="docker run --rm -ti -a stdout -v satlab_keys:$KEY_FOLDER -v gcloud:/root/.config/gcloud google/cloud-sdk:slim"
+ GCLOUD="docker run --rm -ti -a stdout -v satlab_keys:$KEY_FOLDER -v gcloud:/root/.config/gcloud google/cloud-sdk:${GCLOUD_SDK_VERSION}-slim"
SATLAB_SERIVCE_ACCOUNT=satlab-prototype@chromeos-service-accounts-dev.iam.gserviceaccount.com
${GCLOUD} gcloud iam service-accounts keys list --iam-account="$SATLAB_SERIVCE_ACCOUNT" --filter "name=projects/chromeos-service-accounts-dev/serviceAccounts/$SATLAB_SERIVCE_ACCOUNT/keys/$key_id"
echo "###############################################################################"
