Skip to content

Commit 1e5b018

Browse files
athomascommit-bot@chromium.org
authored andcommitted
[infra] Remove obsolete buildbot paths/terms
#42247 Change-Id: Ia0b19677c655bc768f00be77df8b0162ac9e7bea Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/150629 Auto-Submit: Alexander Thomas <[email protected]> Commit-Queue: William Hesse <[email protected]> Reviewed-by: William Hesse <[email protected]>
1 parent 0fab083 commit 1e5b018

File tree

5 files changed

+19
-136
lines changed

5 files changed

+19
-136
lines changed

tools/FAKE_COMMITS

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ Testing update steps
1212
Testing bots after GOLO <> gcs failures
1313
Trigger bots after github outage
1414
Trigger bots on github pull
15-
Trigger bots
15+
Trigger bots
1616
Purple is the new green.
1717
googlecode back up
18-
CIT outage - all slaves rebooted
18+
CIT outage - all bots rebooted
1919
Authentication failure flake - rerun all bots
20-
Trigger bots after master restart - switch dart2js bots to use downloaded sdk.
21-
Trigger bots after master restart.
20+
Trigger bots after restart - switch dart2js bots to use downloaded sdk.
21+
Trigger bots after restart.
2222
Trigger mirroring of github repository
2323
Trigger mirroring of github repository
2424
Trigger mirroring of github repository

tools/archive_crash.py

Lines changed: 0 additions & 79 deletions
This file was deleted.

tools/bots/bot_utils.py

Lines changed: 15 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -195,39 +195,26 @@ def run(command, env=None, shell=False, throw_on_error=True):
195195

196196

197197
class GSUtil(object):
198-
GSUTIL_IS_SHELL_SCRIPT = False
199198
GSUTIL_PATH = None
200199
USE_DART_REPO_VERSION = False
201200

202201
def _layzCalculateGSUtilPath(self):
203202
if not GSUtil.GSUTIL_PATH:
204-
buildbot_gsutil = '/b/build/scripts/slave/gsutil'
205-
if platform.system() == 'Windows':
206-
buildbot_gsutil = 'e:\\\\b\\build\\scripts\\slave\\gsutil'
207-
if os.path.isfile(
208-
buildbot_gsutil) and not GSUtil.USE_DART_REPO_VERSION:
209-
GSUtil.GSUTIL_IS_SHELL_SCRIPT = True
210-
GSUtil.GSUTIL_PATH = buildbot_gsutil
203+
dart_gsutil = os.path.join(DART_DIR, 'third_party', 'gsutil',
204+
'gsutil')
205+
if os.path.isfile(dart_gsutil):
206+
GSUtil.GSUTIL_PATH = dart_gsutil
207+
elif GSUtil.USE_DART_REPO_VERSION:
208+
raise Exception("Dart repository version of gsutil required, "
209+
"but not found.")
211210
else:
212-
dart_gsutil = os.path.join(DART_DIR, 'third_party', 'gsutil',
213-
'gsutil')
214-
if os.path.isfile(dart_gsutil):
215-
GSUtil.GSUTIL_IS_SHELL_SCRIPT = False
216-
GSUtil.GSUTIL_PATH = dart_gsutil
217-
elif GSUtil.USE_DART_REPO_VERSION:
218-
raise Exception(
219-
"Dart repository version of gsutil required, "
220-
"but not found.")
221-
else:
222-
# We did not find gsutil, look in path
223-
possible_locations = list(os.environ['PATH'].split(
224-
os.pathsep))
225-
for directory in possible_locations:
226-
location = os.path.join(directory, 'gsutil')
227-
if os.path.isfile(location):
228-
GSUtil.GSUTIL_IS_SHELL_SCRIPT = False
229-
GSUtil.GSUTIL_PATH = location
230-
break
211+
# We did not find gsutil, look in path
212+
possible_locations = list(os.environ['PATH'].split(os.pathsep))
213+
for directory in possible_locations:
214+
location = os.path.join(directory, 'gsutil')
215+
if os.path.isfile(location):
216+
GSUtil.GSUTIL_PATH = location
217+
break
231218
assert GSUtil.GSUTIL_PATH
232219

233220
def execute(self, gsutil_args):
@@ -238,9 +225,7 @@ def execute(self, gsutil_args):
238225
else:
239226
gsutil_command = [sys.executable, GSUtil.GSUTIL_PATH]
240227

241-
return run(
242-
gsutil_command + gsutil_args,
243-
shell=(GSUtil.GSUTIL_IS_SHELL_SCRIPT and sys.platform == 'win32'))
228+
return run(gsutil_command + gsutil_args)
244229

245230
def upload(self,
246231
local_path,

tools/dom/scripts/multiemitter.py

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -101,21 +101,5 @@ def _WriteFile(path, lines):
101101
# Sleep for 50 ms and try again
102102
time.sleep(0.05)
103103
else:
104-
# FIXME(kustermann): Remove this later on.
105-
# We try to get more debugging information to figure out why we
106-
# sometimes get a "Permission denied" error when opening the file for
107-
# writing. (hypothesis: Another process has already opened the file.)
108104
_logger.info('Got exception (%s) ' % error)
109-
110-
if sys.platform == 'win32':
111-
handle_file = r'E:\handle.exe'
112-
if os.path.exists(handle_file):
113-
_logger.info(
114-
'Running handle.exe for debugging purposes')
115-
subprocess.call(
116-
[handle_file, '-a', r'E:\b\build\slave'])
117-
else:
118-
_logger.info(
119-
"Couldn't find %s. Not printing open handles." %
120-
handle_file)
121105
raise error

tools/utils.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -292,13 +292,6 @@ def ListDartArgCallback(option, value, parser):
292292
VERSION_FILE = os.path.join(DART_DIR, 'tools', 'VERSION')
293293

294294

295-
def GetBuildbotGSUtilPath():
296-
gsutil = '/b/build/scripts/slave/gsutil'
297-
if platform.system() == 'Windows':
298-
gsutil = 'e:\\\\b\\build\\scripts\\slave\\gsutil'
299-
return gsutil
300-
301-
302295
def GetBuildMode(mode):
303296
return BUILD_MODES[mode]
304297

0 commit comments

Comments
 (0)