Commit c05b5e52 authored by Narcis Beleuzu's avatar Narcis Beleuzu
Browse files

Backed out 5 changesets (bug 1669879, bug 1677914) for Linux time outs. a=aki

Backed out changeset 5001c738049d (bug 1677914)
Backed out changeset 278829e6842f (bug 1677914)
Backed out changeset 44c171274166 (bug 1677914)
Backed out changeset e33d8b470e16 (bug 1677914)
Backed out changeset 8b5c0a5b7501 (bug 1669879)
parent a81a6baa
......@@ -27,9 +27,6 @@ elif 'MOZILLABUILD' in os.environ:
_current_shell = os.environ['MOZILLABUILD'] + '/msys/bin/sh.exe'
elif 'COMSPEC' in os.environ:
_current_shell = os.environ['COMSPEC']
elif sys.platform != "win32":
# Fall back to a standard shell.
_current_shell = "/bin/sh"
else:
raise Exception('Could not detect environment shell!')
......
......@@ -408,14 +408,6 @@ workers:
implementation: generic-worker
os: windows
worker-type: '{alias}'
b-osx-1015:
provisioner: releng-hardware
implementation: generic-worker
os: macosx
worker-type:
by-level:
'3': 'gecko-3-b-osx-1015'
default: 'gecko-1-b-osx-1015'
images:
provisioner: '{trust-domain}-{level}'
implementation: docker-worker
......@@ -534,6 +526,22 @@ 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
os: macosx
worker-type:
by-level:
'3': 'gecko-{level}-t-osx-1014'
default: 'gecko-t-osx-1014'
t-win10-64(|-gpu-s|-source):
provisioner: '{trust-domain}-t'
implementation: generic-worker
......
......@@ -34,7 +34,6 @@ jobs:
platform: linux32-shippable/opt
worker-type: b-linux
worker:
chain-of-trust: true
env:
NEED_XVFB: "true"
max-run-time: 1200
......@@ -65,7 +64,6 @@ jobs:
platform: linux64-shippable/opt
worker-type: b-linux
worker:
chain-of-trust: true
env:
NEED_XVFB: "true"
max-run-time: 1200
......@@ -95,7 +93,6 @@ jobs:
platform: android-4-0-armv7-api16/pgo
worker-type: t-linux-xlarge-pgo
worker:
chain-of-trust: true
max-run-time: 5400
docker-image: {in-tree: ubuntu1804-test}
env:
......@@ -132,7 +129,6 @@ jobs:
platform: windows2012-32-shippable/opt
worker-type: b-win2012
worker:
chain-of-trust: true
max-run-time: 1200
env:
UPLOAD_PATH: "artifacts"
......@@ -161,7 +157,6 @@ jobs:
platform: windows2012-64-shippable/opt
worker-type: b-win2012
worker:
chain-of-trust: true
max-run-time: 1200
env:
UPLOAD_PATH: "artifacts"
......@@ -188,9 +183,8 @@ jobs:
job-name: macosx64-profile
treeherder:
platform: macosx1014-64-shippable/opt
worker-type: b-osx-1015
worker-type: t-osx-1014-pgo
worker:
chain-of-trust: true
max-run-time: 7200
env:
SHELL: "/bin/bash"
......
......@@ -411,7 +411,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.
......
......@@ -30,9 +30,11 @@ def set_defaults(config, jobs):
_, worker_os = worker_type_implementation(config.graph_config, job['worker-type'])
worker = job.setdefault('worker', {})
worker.setdefault('env', {})
worker["chain-of-trust"] = True
if worker_os == "linux":
worker.setdefault('docker-image', {'in-tree': 'debian8-amd64-build'})
worker['chain-of-trust'] = True
elif worker_os == "windows":
worker['chain-of-trust'] = True
yield job
......
......@@ -171,7 +171,6 @@ def windows_toolchain(config, job, taskdesc):
run = job['run']
worker = taskdesc['worker'] = job['worker']
worker["chain-of-trust"] = True
# Allow the job to specify where artifacts come from.
worker.setdefault('artifacts', [{
......@@ -179,11 +178,12 @@ def windows_toolchain(config, job, taskdesc):
'type': 'directory',
}])
if job["worker"]["os"] == "windows":
# There were no caches on generic-worker before bug 1519472, and they cause
# all sorts of problems with Windows toolchain tasks, disable them until
# tasks are ready.
run["use-caches"] = False
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
env = worker.setdefault('env', {})
env.update({
......
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