diff options
| author | Tom Prince <mozilla@hocat.ca> | 2019-11-07 19:58:42 +0000 |
|---|---|---|
| committer | Tom Prince <mozilla@hocat.ca> | 2019-11-07 19:58:42 +0000 |
| commit | 6f23c473c17828a5a74a4e0186a077e401d416a2 (patch) | |
| tree | 75a1b4e57f92d726eda6ad69fbcd1b6bcb9b46f8 /automation/taskcluster | |
| parent | a79cacbe5b1777b847487623097a470d7cc96ae8 (diff) | |
| download | nss-hg-6f23c473c17828a5a74a4e0186a077e401d416a2.tar.gz | |
Bug 1591275: Switch workers to use AWS Provder; r=kjacobs
Differential Revision: https://phabricator.services.mozilla.com/D51952
Diffstat (limited to 'automation/taskcluster')
| -rw-r--r-- | automation/taskcluster/graph/src/extend.js | 2 | ||||
| -rw-r--r-- | automation/taskcluster/graph/src/queue.js | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/automation/taskcluster/graph/src/extend.js b/automation/taskcluster/graph/src/extend.js index 5b22ef805..762198b2e 100644 --- a/automation/taskcluster/graph/src/extend.js +++ b/automation/taskcluster/graph/src/extend.js @@ -829,7 +829,7 @@ async function scheduleFuzzing32() { async function scheduleWindows(name, base, build_script) { base = merge(base, { - workerType: "nss-win2012r2", + workerType: "win2012r2", env: { PATH: "c:\\mozilla-build\\bin;c:\\mozilla-build\\python;" + "c:\\mozilla-build\\msys\\local\\bin;c:\\mozilla-build\\7zip;" + diff --git a/automation/taskcluster/graph/src/queue.js b/automation/taskcluster/graph/src/queue.js index 874947af5..5a9dc4023 100644 --- a/automation/taskcluster/graph/src/queue.js +++ b/automation/taskcluster/graph/src/queue.js @@ -156,8 +156,8 @@ function convertTask(def) { }, parameters); return { - provisionerId: def.provisioner || "aws-provisioner-v1", - workerType: def.workerType || "hg-worker", + provisionerId: def.provisioner || `nss-${process.env.MOZ_SCM_LEVEL}`, + workerType: def.workerType || "linux", schedulerId: process.env.TC_SCHEDULER_ID, taskGroupId: process.env.TASK_ID, |