Overdue changes for gs_check.py
This fixes:
1) Error when testing bucket access. Root does not
have the correct priviledges to access gs, so the
check must be run as the moblab user.
2) Add a check warning when we are configured to access
an internal bucket.
Change-Id: I7e38d1d641f341fe50cbdcc93f93a61245207d9a
Reviewed-on: https://chromium-review.googlesource.com/362385
Commit-Ready: Simran Basi <sbasi@chromium.org>
Tested-by: Simran Basi <sbasi@chromium.org>
Reviewed-by: Simran Basi <sbasi@chromium.org>
(cherry picked from commit f8b1019f4f7f498ad2cb3c077fcc895570308370)
Reviewed-on: https://chromium-review.googlesource.com/362652
Reviewed-by: Krk Mohan <krk@google.com>
diff --git a/checkfiles/devserver/gs_check.py b/checkfiles/devserver/gs_check.py
index 3528f4d..977d2c4 100644
--- a/checkfiles/devserver/gs_check.py
+++ b/checkfiles/devserver/gs_check.py
@@ -18,6 +18,8 @@
SHADOW_CONFIG = '/usr/local/autotest/shadow_config.ini'
GSUTIL_TIMEOUT_SEC = 5
+GSUTIL_USER = 'moblab'
+GSUTIL_INTERNAL_BUCKETS = ['gs://chromeos-image-archive']
MOBLAB_SUBNET_ADDR = '192.168.231.1'
@@ -67,7 +69,7 @@
cmd = ['timeout', '-s', '9', str(GSUTIL_TIMEOUT_SEC),
'gsutil', 'ls', '-b', gs_url]
try:
- cros_build_lib.RunCommand(cmd)
+ cros_build_lib.SudoRunCommand(cmd, user=GSUTIL_USER)
except cros_build_lib.RunCommandError:
return False
@@ -102,10 +104,17 @@
self.bucket = gs_url
return -2
+ if gs_url in GSUTIL_INTERNAL_BUCKETS:
+ self.bucket = gs_url
+ return 1
+
return 0
def Diagnose(self, errcode):
- if -1 == errcode:
+ if 1 == errcode:
+ return ('Using an internal Google Storage bucket %s' % self.bucket, [])
+
+ elif -1 == errcode:
return ('An autotest configuration file is missing.', [])
elif -2 == errcode: