Bug 1591275: Switch workers to use AWS Provder; r=kjacobs
authorTom Prince <mozilla@hocat.ca>
Thu, 07 Nov 2019 19:58:42 +0000
changeset 15379 a2bebaad41dd7b8e543c2ba8df1f9b83ab01876c
parent 15378 c9014b2892d5d2d17874f269a56c592dc7007517
child 15380 67d630e7cb7cbf943408f9e238d41839028bcfee
push id3572
push userjjones@mozilla.com
push dateThu, 07 Nov 2019 21:01:22 +0000
reviewerskjacobs
bugs1591275
Bug 1591275: Switch workers to use AWS Provder; r=kjacobs Differential Revision: https://phabricator.services.mozilla.com/D51952
.taskcluster.yml
automation/taskcluster/graph/src/extend.js
automation/taskcluster/graph/src/queue.js
--- a/.taskcluster.yml
+++ b/.taskcluster.yml
@@ -33,18 +33,18 @@ tasks:
 
       metadata:
         owner: mozilla-taskcluster-maintenance@mozilla.com
         source: "${repository.url}"
         name: "NSS Decision Task"
         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'
       tags:
         createdForUser: "${ownerEmail}"
 
       routes:
         - "tc-treeherder-stage.v2.${repository.project}.${push.revision}.${push.pushlog_id}"
@@ -54,16 +54,17 @@ tasks:
         # TODO: use nssdev org , not djmitche, once the image is pushed there
         image: djmitche/nss-decision:0.0.3
 
         env:
           TC_OWNER: "${ownerEmail}"
           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}'
 
         maxRunTime: 1800
 
         command:
           - bash
--- a/automation/taskcluster/graph/src/extend.js
+++ b/automation/taskcluster/graph/src/extend.js
@@ -824,17 +824,17 @@ async function scheduleFuzzing32() {
 
   return queue.submit();
 }
 
 /*****************************************************************************/
 
 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;" +
 	    "c:\\mozilla-build\\info-zip;c:\\mozilla-build\\python\\Scripts;" +
 	    "c:\\mozilla-build\\yasm;c:\\mozilla-build\\msys\\bin;" +
 	    "c:\\Windows\\system32;c:\\mozilla-build\\upx391w;" +
 	    "c:\\mozilla-build\\moztools-x64\\bin;c:\\mozilla-build\\wget",
       DOMSUF: "localdomain",
--- a/automation/taskcluster/graph/src/queue.js
+++ b/automation/taskcluster/graph/src/queue.js
@@ -151,18 +151,18 @@ function convertTask(def) {
     scopes.push.apply(scopes, def.scopes)
   }
 
   let extra = Object.assign({
     treeherder: parseTreeherder(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,
 
     scopes,
     created: fromNow(0),
     deadline: fromNow(24),
 
     dependencies,