Bug 1465181 - Use releng-hardware/gecko-t-linux-talos workerType for js-bench tasks, r?jmaher
This will get the js-bench tasks to run on physical hardware instead of AWS.
MozReview-Commit-ID: 44XavXAwxxn
--- a/taskcluster/ci/source-test/jsshell.yml
+++ b/taskcluster/ci/source-test/jsshell.yml
@@ -1,44 +1,46 @@
job-defaults:
platform: linux64/opt
require-build: true
worker-type:
by-platform:
- linux64.*: aws-provisioner-v1/gecko-t-linux-xlarge
+ linux64.*: releng-hardware/gecko-t-linux-talos
worker:
by-platform:
linux64.*:
- docker-image: {in-tree: "desktop1604-test"}
+ env:
+ SHELL: /bin/bash
max-run-time: 1800
treeherder:
kind: test
tier: 2
run:
using: run-task
use-artifacts:
build:
- target.jsshell.zip
+ workdir: /home/cltbld
run-on-projects: ['mozilla-central', 'try']
bench-ares6:
description: Ares6 JavaScript shell benchmark suite
treeherder:
symbol: js-bench(ares6)
run:
command: >
cd $USE_ARTIFACT_PATH/build &&
unzip -q -d jsshell target.jsshell.zip &&
export JSSHELL=$USE_ARTIFACT_PATH/build/jsshell/js &&
- cd /builds/worker/checkouts/gecko &&
+ cd $GECKO_PATH &&
./mach jsshell-bench --binary $JSSHELL --perfherder ares6
bench-sixspeed:
description: Six-Speed JavaScript shell benchmark suite
treeherder:
symbol: js-bench(6speed)
run:
command: >
cd $USE_ARTIFACT_PATH/build &&
unzip -q -d jsshell target.jsshell.zip &&
export JSSHELL=$USE_ARTIFACT_PATH/build/jsshell/js &&
- cd /builds/worker/checkouts/gecko &&
+ cd $GECKO_PATH &&
./mach jsshell-bench --binary $JSSHELL --perfherder six-speed
--- a/taskcluster/taskgraph/transforms/job/common.py
+++ b/taskcluster/taskgraph/transforms/job/common.py
@@ -87,16 +87,17 @@ def support_vcs_checkout(config, job, ta
'name': name,
'mount-point': '{workdir}/checkouts'.format(**job['run']),
})
taskdesc['worker'].setdefault('env', {}).update({
'GECKO_BASE_REPOSITORY': config.params['base_repository'],
'GECKO_HEAD_REPOSITORY': config.params['head_repository'],
'GECKO_HEAD_REV': config.params['head_rev'],
+ 'GECKO_PATH': '{workdir}/checkouts/gecko'.format(**job['run']),
'HG_STORE_PATH': '{workdir}/checkouts/hg-store'.format(**job['run']),
})
if 'comm_base_repository' in config.params:
taskdesc['worker']['env'].update({
'COMM_BASE_REPOSITORY': config.params['comm_base_repository'],
'COMM_HEAD_REPOSITORY': config.params['comm_head_repository'],
'COMM_HEAD_REV': config.params['comm_head_rev'],