Bug 1281241 - Use large desktop-test instances by default on TaskCluster. r?jmaher draft
authorAndrew Comminos <andrew@comminos.com>
Wed, 17 Aug 2016 17:24:08 -0400
changeset 401995 2c4b0baf123c96d03444f9bbdfaad49a7252914a
parent 401500 fe895421dfbe1f1f8f1fc6a39bb20774423a6d74
child 401996 f636a9ab2125e1c800e260b4f1ede83565bebc6e
child 402006 bd3773b05021e57f81380c9f64384eb9df08c581
child 402409 9a504e1481ffea9f24458826d3360cabb9f1b1a9
child 402699 2676ec57cedae860f1518b1f26d10c61510a304b
push id26599
push userbmo:andrew@comminos.com
push dateWed, 17 Aug 2016 21:27:57 +0000
reviewersjmaher
bugs1281241
milestone51.0a1
Bug 1281241 - Use large desktop-test instances by default on TaskCluster. r?jmaher MozReview-Commit-ID: 4SntPKPoJOS
taskcluster/ci/desktop-test/tests.yml
taskcluster/taskgraph/transforms/tests/make_task_description.py
taskcluster/taskgraph/transforms/tests/test_description.py
--- a/taskcluster/ci/desktop-test/tests.yml
+++ b/taskcluster/ci/desktop-test/tests.yml
@@ -144,16 +144,18 @@ mochitest:
         script: mozharness/scripts/desktop_unittest.py
         no-read-buildbot-config: true
         chunked: true
         config:
             - mozharness/configs/unittests/linux_unittest.py
             - mozharness/configs/remove_executables.py
         extra-options:
             - --mochitest-suite=plain-chunked
+    # Bug 1281241: migrating to m3.large instances
+    instance-size: legacy
 
 mochitest-a11y:
     description: "Mochitest a11y run"
     suite: mochitest/a11y
     treeherder-symbol: tc-M(a11y)
     loopback-video: true
     e10s: false
     mozharness:
@@ -179,16 +181,18 @@ mochitest-browser-chrome:
     mozharness:
         script: mozharness/scripts/desktop_unittest.py
         no-read-buildbot-config: true
         config:
             - mozharness/configs/unittests/linux_unittest.py
             - mozharness/configs/remove_executables.py
         extra-options:
             - --mochitest-suite=browser-chrome-chunked
+    # Bug 1281241: migrating to m3.large instances
+    instance-size: legacy
 
 mochitest-chrome:
     description: "Mochitest chrome run"
     suite: mochitest/chrome
     treeherder-symbol: tc-M(c)
     loopback-video: true
     chunks: 3
     e10s: false
--- a/taskcluster/taskgraph/transforms/tests/make_task_description.py
+++ b/taskcluster/taskgraph/transforms/tests/make_task_description.py
@@ -120,19 +120,20 @@ def docker_worker_setup(config, test, ta
 
     installer_url = ARTIFACT_URL.format('<build>', mozharness['build-artifact-name'])
     test_packages_url = ARTIFACT_URL.format('<build>',
                                             'public/build/target.test_packages.json')
     mozharness_url = ARTIFACT_URL.format('<build>',
                                          'public/build/mozharness.zip')
 
     taskdesc['worker-type'] = {
-        'default': 'aws-provisioner-v1/desktop-test',
+        'default': 'aws-provisioner-v1/desktop-test-large',
         'large': 'aws-provisioner-v1/desktop-test-large',
         'xlarge': 'aws-provisioner-v1/desktop-test-xlarge',
+        'legacy': 'aws-provisioner-v1/desktop-test',
     }[test['instance-size']]
 
     worker = taskdesc['worker'] = {}
     worker['implementation'] = test['worker-implementation']
 
     docker_image = test.get('docker-image')
     assert docker_image, "no docker image defined for a docker-worker/docker-engine task"
     if isinstance(docker_image, dict):
--- a/taskcluster/taskgraph/transforms/tests/test_description.py
+++ b/taskcluster/taskgraph/transforms/tests/test_description.py
@@ -72,18 +72,18 @@ test_description_schema = Schema({
     # and treeherder group.
     Required('e10s', default='both'): Any(
         bool, 'both',
         {'by-test-platform': {basestring: Any(bool, 'both')}},
     ),
 
     # The EC2 instance size to run these tests on.
     Required('instance-size', default='default'): Any(
-        Any('default', 'large', 'xlarge'),
-        {'by-test-platform': {basestring: Any('default', 'large', 'xlarge')}},
+        Any('default', 'large', 'xlarge', 'legacy'),
+        {'by-test-platform': {basestring: Any('default', 'large', 'xlarge', 'legacy')}},
     ),
 
     # Whether the task requires loopback audio or video (whatever that may mean
     # on the platform)
     Required('loopback-audio', default=False): bool,
     Required('loopback-video', default=False): bool,
 
     # The worker implementation for this test, as dictated by policy and by the