зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1551957 - Allow for osx 10.14 in CI for source tasks. r=ahal
Allow for osx 10.14 in CI for source tasks. Differential Revision: https://phabricator.services.mozilla.com/D31297 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Родитель
dafe417481
Коммит
ec5f3f9ae1
|
@ -27,6 +27,7 @@ import errno
|
|||
import io
|
||||
import json
|
||||
import os
|
||||
import platform
|
||||
import random
|
||||
import re
|
||||
import shutil
|
||||
|
@ -37,7 +38,6 @@ import subprocess
|
|||
import urllib.error
|
||||
import urllib.request
|
||||
|
||||
|
||||
FINGERPRINT_URL = 'http://taskcluster/secrets/v1/secret/project/taskcluster/gecko/hgfingerprint'
|
||||
FALLBACK_FINGERPRINT = {
|
||||
'fingerprints':
|
||||
|
@ -405,7 +405,12 @@ def vcs_checkout(source_repo, dest, store_path,
|
|||
sys.exit(1)
|
||||
|
||||
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:
|
||||
|
|
|
@ -44,6 +44,9 @@ def configure_mach(config, job, taskdesc):
|
|||
run = job['run']
|
||||
|
||||
command_prefix = 'cd $GECKO_PATH && ./mach '
|
||||
if job['worker-type'].endswith('1014'):
|
||||
command_prefix = 'cd $GECKO_PATH && LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 ./mach '
|
||||
|
||||
mach = run['mach']
|
||||
if isinstance(mach, dict):
|
||||
ref, pattern = next(iter(mach.items()))
|
||||
|
|
|
@ -40,6 +40,8 @@ def configure_python_test(config, job, taskdesc):
|
|||
if worker['os'] == 'macosx' and run['python-version'] == 3:
|
||||
# OSX hosts can't seem to find python 3 on their own
|
||||
run['python-version'] = '/tools/python36/bin/python3.6'
|
||||
if job['worker-type'].endswith('1014'):
|
||||
run['python-version'] = '/usr/local/bin/python3'
|
||||
|
||||
# defer to the mach implementation
|
||||
run['mach'] = 'python-test --python {python-version} --subsuite {subsuite}'.format(**run)
|
||||
|
|
|
@ -130,6 +130,8 @@ def generic_worker_run_task(config, job, taskdesc):
|
|||
command = ['C:/mozilla-build/python3/python3.exe', 'run-task']
|
||||
elif is_mac:
|
||||
command = ['/tools/python36/bin/python3.6', 'run-task']
|
||||
if job['worker-type'].endswith('1014'):
|
||||
command = ['/usr/local/bin/python3', 'run-task']
|
||||
else:
|
||||
command = ['./run-task']
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче