Commit 5dc089e3 authored by John Chen's avatar John Chen Committed by Commit Bot

[ChromeDriver] Change location of browser snapshots

The directory names in chromium-browser-snapshots bucket have
changed recently, breaking all ChromeDriver builds. Changing
ChromeDriver waterfall script to compensate. In particular,
the following directory names have changed:

    Win -> win32_rel
    Mac -> mac_rel
    Linux_x64 -> linux_rel

Also removing obsolete code for 32-bit Linux.

TBR=crouleau@chromium.org

Change-Id: I2927152abc91a097fbb3c50693a578eaecc44752
Reviewed-on: https://chromium-review.googlesource.com/1157908Reviewed-by: default avatarJohn Chen <johnchen@chromium.org>
Commit-Queue: John Chen <johnchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#579695}
parent e86d6dbf
...@@ -21,7 +21,6 @@ CR_REV_URL = 'https://cr-rev.appspot.com/_ah/api/crrev/v1/redirect/%s' ...@@ -21,7 +21,6 @@ CR_REV_URL = 'https://cr-rev.appspot.com/_ah/api/crrev/v1/redirect/%s'
class Site(object): class Site(object):
CHROMIUM_SNAPSHOT = _SITE + '/chromium-browser-snapshots' CHROMIUM_SNAPSHOT = _SITE + '/chromium-browser-snapshots'
CHROMIUM_LINUX = _SITE + '/chromium-linux-archive/chromium.linux'
def GetLatestRevision(): def GetLatestRevision():
...@@ -51,10 +50,7 @@ def DownloadChrome(revision, dest_dir, site=Site.CHROMIUM_SNAPSHOT): ...@@ -51,10 +50,7 @@ def DownloadChrome(revision, dest_dir, site=Site.CHROMIUM_SNAPSHOT):
elif util.IsMac(): elif util.IsMac():
return revision + '/chrome-mac.zip' return revision + '/chrome-mac.zip'
elif util.IsLinux(): elif util.IsLinux():
if util.Is64Bit(): return revision + '/chrome-linux.zip'
return revision + '/chrome-linux.zip'
else:
return 'full-build-linux_' + revision + '.zip'
def GetDirName(): def GetDirName():
if util.IsWindows(): if util.IsWindows():
...@@ -62,10 +58,7 @@ def DownloadChrome(revision, dest_dir, site=Site.CHROMIUM_SNAPSHOT): ...@@ -62,10 +58,7 @@ def DownloadChrome(revision, dest_dir, site=Site.CHROMIUM_SNAPSHOT):
elif util.IsMac(): elif util.IsMac():
return 'chrome-mac' return 'chrome-mac'
elif util.IsLinux(): elif util.IsLinux():
if util.Is64Bit(): return 'chrome-linux'
return 'chrome-linux'
else:
return 'full-build-linux'
def GetChromePathFromPackage(): def GetChromePathFromPackage():
if util.IsWindows(): if util.IsWindows():
...@@ -87,31 +80,22 @@ def DownloadChrome(revision, dest_dir, site=Site.CHROMIUM_SNAPSHOT): ...@@ -87,31 +80,22 @@ def DownloadChrome(revision, dest_dir, site=Site.CHROMIUM_SNAPSHOT):
def _GetDownloadPlatform(): def _GetDownloadPlatform():
"""Returns the name for this platform on the archive site.""" """Returns the name for this platform on the archive site."""
if util.IsWindows(): if util.IsWindows():
return 'Win' return 'win32_rel'
elif util.IsMac(): elif util.IsMac():
return 'Mac' return 'mac_rel'
elif util.IsLinux(): elif util.IsLinux():
if util.Is64Bit(): return 'linux_rel'
return 'Linux_x64'
else:
return 'Linux Builder (dbg)(32)'
def GetLatestSnapshotPosition(): def GetLatestSnapshotPosition():
"""Returns the latest commit position of snapshot build.""" """Returns the latest commit position of snapshot build."""
latest_revision = GetLatestRevision() latest_revision = GetLatestRevision()
if util.IsLinux() and not util.Is64Bit(): return latest_revision
return GetCommitPositionFromGitHash(latest_revision)
else:
return latest_revision
def GetDownloadSite(): def GetDownloadSite():
"""Returns the site to download snapshot build according to the platform.""" """Returns the site to download snapshot build according to the platform."""
if util.IsLinux() and not util.Is64Bit(): return Site.CHROMIUM_SNAPSHOT
return Site.CHROMIUM_LINUX
else:
return Site.CHROMIUM_SNAPSHOT
def GetCommitPositionFromGitHash(snapshot_hashcode): def GetCommitPositionFromGitHash(snapshot_hashcode):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment