Skip to content

Commit af4b075

Browse files
Revert "Enable gcloud storage mac android" (#5110)
This reverts commit 5a6b435. It seems that MAC needs the GSUTIL_PATH based on error logs: https://cloudlogging.app.goo.gl/CkDXHKEkbLdCRFzw5
1 parent 60da475 commit af4b075

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

src/clusterfuzz/_internal/google_cloud_utils/gsutil.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ def get_gsutil_path():
6767
'containing gsutil binary.')
6868
return None
6969

70+
logs.info(f'Using gsutil executable from GSUTIL_PATH: {gsutil_directory}')
7071
gsutil_absolute_path = os.path.join(gsutil_directory, gsutil_executable)
7172
return gsutil_absolute_path
7273

src/clusterfuzz/_internal/system/environment.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1020,12 +1020,6 @@ def set_bot_environment():
10201020
from clusterfuzz._internal.config import local_config
10211021
local_config.ProjectConfig().set_environment()
10221022

1023-
# Tmp: set gcloud_storage flag for android/MAC bots
1024-
# to validate the gsutil migration on these platforms.
1025-
if is_android() or platform() == 'MAC':
1026-
os.environ['USE_GCLOUD_STORAGE_CP'] = 'True'
1027-
os.environ['USE_GCLOUD_STORAGE_RSYNC'] = '1'
1028-
10291023
# Success.
10301024
return True
10311025

0 commit comments

Comments
 (0)