Backed out 2 changesets (bug 1669879) for docker failures CLOSED TREE

Backed out changeset f484bfd1ad97 (bug 1669879)
Backed out changeset 86061c7de217 (bug 1669879)
This commit is contained in:
Bogdan Tara 2020-10-09 07:50:02 +03:00
Родитель bc9d9e13d4
Коммит 6a589167f0
2 изменённых файлов: 21 добавлений и 1 удалений

Просмотреть файл

@ -539,6 +539,11 @@ workers:
implementation: generic-worker
os: linux
worker-type: 'gecko-{alias}'
t-osx-1010:
provisioner: releng-hardware
implementation: generic-worker
os: macosx
worker-type: 'gecko-{alias}'
t-osx-1014:
provisioner: releng-hardware
implementation: generic-worker
@ -557,6 +562,14 @@ workers:
implementation: docker-worker
os: linux
worker-type: 't-linux-xlarge'
t-osx-1010-pgo:
provisioner: releng-hardware
implementation: generic-worker
os: macosx
worker-type:
by-level:
'3': 'gecko-{level}-t-osx-1010'
default: 'gecko-t-osx-1010'
t-osx-1014-pgo:
provisioner: releng-hardware
implementation: generic-worker

Просмотреть файл

@ -414,7 +414,14 @@ def vcs_checkout(source_repo, dest, store_path,
print('revision is not specified for checkout')
sys.exit(1)
if IS_MACOSX or IS_POSIX:
if IS_MACOSX:
release = platform.mac_ver()
versionNums = release[0].split('.')[:2]
os_version = "%s.%s" % (versionNums[0], versionNums[1])
hg_bin = '/tools/python27-mercurial/bin/hg'
if os_version == "10.14":
hg_bin = 'hg'
elif IS_POSIX:
hg_bin = 'hg'
elif IS_WINDOWS:
# This is where OCC installs it in the AMIs.