Bug 1647498 - set default docker-image attribute to ubuntu1804-test r=jmaher
authorEdwin Takahashi <egao@mozilla.com>
Mon, 22 Jun 2020 22:24:07 +0000
changeset 536966 cf5883d7b082d81d25e4cc12db3fe89d7b22d9c0
parent 536965 9f8a5999699486d0557733545376ce27db128fa4
child 536967 9720c404522dc72dda24003efd188a6972f8b4db
push id119733
push useregao@mozilla.com
push dateTue, 23 Jun 2020 18:05:37 +0000
treeherderautoland@cf5883d7b082 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher
bugs1647498
milestone79.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1647498 - set default docker-image attribute to ubuntu1804-test r=jmaher This change affects some android-em tests that continued to run on the deprecated `desktop1604-test` image. Differential Revision: https://phabricator.services.mozilla.com/D80561
taskcluster/taskgraph/transforms/tests.py
--- a/taskcluster/taskgraph/transforms/tests.py
+++ b/taskcluster/taskgraph/transforms/tests.py
@@ -662,22 +662,17 @@ def set_defaults(config, tasks):
         task.setdefault('built-projects-only', False)
         task.setdefault('instance-size', 'default')
         task.setdefault('max-run-time', 3600)
         task.setdefault('reboot', False)
         task.setdefault('virtualization', 'virtual')
         task.setdefault('loopback-audio', False)
         task.setdefault('loopback-video', False)
         task.setdefault('limit-platforms', [])
-        # Bug 1602863 - temporarily in place while ubuntu1604 and ubuntu1804
-        # both exist in the CI.
-        if ('linux1804' in task['test-platform']):
-            task.setdefault('docker-image', {'in-tree': 'ubuntu1804-test'})
-        else:
-            task.setdefault('docker-image', {'in-tree': 'desktop1604-test'})
+        task.setdefault('docker-image', {'in-tree': 'ubuntu1804-test'})
         task.setdefault('checkout', False)
         task.setdefault('require-signed-extensions', False)
         task.setdefault('variants', [])
 
         task['mozharness'].setdefault('extra-options', [])
         task['mozharness'].setdefault('requires-signed-builds', False)
         task['mozharness'].setdefault('tooltool-downloads', 'public')
         task['mozharness'].setdefault('set-moz-node-path', False)