Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-21 17:25:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backout changeset 834d38825814 (bug 1528155) and b759c45d1f01 to give time to toolchains to build.

Browse Source
This commit is contained in:
Mike Hommey 2019-02-16 20:35:08 +09:00
parent e62cab9ab7
commit eeb59260ed
2 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
taskcluster/taskgraph/transforms/job/common.py
View File

@ -160,8 +160,7 @@ def support_vcs_checkout(config, job, taskdesc, sparse=False):
taskdesc['worker']['taskcluster-proxy'] = True
def generic_worker_hg_commands(base_repo, head_repo, head_rev, path,
sparse_profile=None):
def generic_worker_hg_commands(base_repo, head_repo, head_rev, path):
"""Obtain commands needed to obtain a Mercurial checkout on generic-worker.
Returns two command strings. One performs the checkout. Another logs.
@ -173,16 +172,9 @@ def generic_worker_hg_commands(base_repo, head_repo, head_rev, path,
'--purge',
'--upstream', base_repo,
'--revision', head_rev,
]
if sparse_profile:
args.extend(['--config', 'extensions.sparse='])
args.extend(['--sparseprofile', sparse_profile])
args.extend([
head_repo,
path,
])
]
logging_args = [
b":: TinderboxPrint:<a href={source_repo}/rev/{revision} "

14
taskcluster/taskgraph/transforms/job/toolchain.py
View File

@ -123,7 +123,7 @@ def docker_worker_toolchain(config, job, taskdesc):
if not any(artifact.get('name') == 'public/build' for artifact in artifacts):
docker_worker_add_artifacts(config, job, taskdesc)
support_vcs_checkout(config, job, taskdesc, sparse=('sparse-profile' in run))
support_vcs_checkout(config, job, taskdesc, sparse=True)
# Toolchain checkouts don't live under {workdir}/checkouts
workspace = '{workdir}/workspace/build'.format(**run)
@ -197,11 +197,7 @@ def windows_toolchain(config, job, taskdesc):
}]
worker['chain-of-trust'] = True
# There were no caches on generic-worker before bug 1519472, and they cause
# all sorts of problems with toolchain tasks, disable them until
# tasks are ready.
run['use-caches'] = False
support_vcs_checkout(config, job, taskdesc, sparse=('sparse-profile' in run))
support_vcs_checkout(config, job, taskdesc)
env = worker['env']
env.update({
@ -210,15 +206,11 @@ def windows_toolchain(config, job, taskdesc):
'MOZ_AUTOMATION': '1',
})
sparse_profile = run.get('sparse-profile')
if sparse_profile:
sparse_profile = 'build/sparse-profiles/{}'.format(run['sparse-profile'])
hg_command = generic_worker_hg_commands(
'https://hg.mozilla.org/mozilla-unified',
env['GECKO_HEAD_REPOSITORY'],
env['GECKO_HEAD_REV'],
r'.\build\src', sparse_profile=sparse_profile)[0]
r'.\build\src')[0]
# Use `mach` to invoke python scripts so in-tree libraries are available.
if run['script'].endswith('.py'):