Commit b3f15aa1 authored by Tom Prince's avatar Tom Prince

Bug 1591275: Switch workers to use AWS Provder; r=kjacobs

Differential Revision: https://phabricator.services.mozilla.com/D51952

--HG--
extra : moz-landing-system : lando
parent 1534d564
......@@ -38,8 +38,8 @@ tasks:
description: |
The task that creates all of the other tasks in the task graph
workerType: "hg-worker"
provisionerId: "aws-provisioner-v1"
workerType: "linux"
provisionerId: "nss-${repository.level}"
scopes:
- 'assume:repo:${repoUrl[8:]}:branch:default'
......@@ -59,6 +59,7 @@ tasks:
TC_SOURCE: "${repository.url}"
TC_PROJECT: ${repository.project}
TC_SCHEDULER_ID: "${schedulerId}"
MOZ_SCM_LEVEL: "${repository.level}"
NSS_PUSHLOG_ID: '${push.pushlog_id}'
NSS_HEAD_REPOSITORY: '${repository.url}'
NSS_HEAD_REVISION: '${push.revision}'
......
......@@ -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;" +
......
......@@ -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,
......
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