bug 1358601: set up CI builds and tests for DevEdition on mozilla-beta - fix stage_platform, clobbers, and update_channel. r=asasaki, a=jcristau
authorBen Hearsum <bhearsum@mozilla.com>
Mon, 01 May 2017 09:31:09 -0400
changeset 396091 411f3cf152dcfe37e90b28a5df9c7c3de65a1b32
parent 396090 4a587e53611752e69d79f6dddecada695234dbba
child 396092 8cee26a9755fe6d5b6187ee373dcfdf86410309f
push id1468
push userasasaki@mozilla.com
push dateMon, 05 Jun 2017 19:31:07 +0000
treeherdermozilla-release@0641fc6ee9d1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersasasaki, jcristau
bugs1358601
milestone54.0
bug 1358601: set up CI builds and tests for DevEdition on mozilla-beta - fix stage_platform, clobbers, and update_channel. r=asasaki, a=jcristau Because DevEdition builds are intended to be shipped, we must force clobbers on all of them. We also need to fix the update channel, which is currently still set to "beta". In order to make it possible to override this we need to change stage_platform to a unique value. MozReview-Commit-ID: FO3pQzmYjHx
testing/mozharness/configs/builds/branch_specifics.py
testing/mozharness/configs/builds/releng_sub_linux_configs/32_devedition.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_devedition.py
testing/mozharness/configs/builds/releng_sub_mac_configs/64_devedition.py
testing/mozharness/configs/builds/releng_sub_windows_configs/32_devedition.py
testing/mozharness/configs/builds/releng_sub_windows_configs/64_devedition.py
--- a/testing/mozharness/configs/builds/branch_specifics.py
+++ b/testing/mozharness/configs/builds/branch_specifics.py
@@ -132,16 +132,31 @@ config = {
             'win32': {
                 'src_mozconfig': 'browser/config/mozconfigs/win32/beta',
                 'force_clobber': True,
             },
             'win64': {
                 'src_mozconfig': 'browser/config/mozconfigs/win64/beta',
                 'force_clobber': True,
             },
+            'linux-devedition': {
+                "update_channel": "aurora",
+            },
+            'linux64-devedition': {
+                "update_channel": "aurora",
+            },
+            'macosx64-devedition': {
+                "update_channel": "aurora",
+            },
+            'win32-devedition': {
+                "update_channel": "aurora",
+            },
+            'win64-devedition': {
+                "update_channel": "aurora",
+            },
             'linux-debug': {
                 'update_channel': 'default',
             },
             'linux64-debug': {
                 'update_channel': 'default',
             },
             'linux64-asan-debug': {
                 'update_channel': 'default',
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/32_devedition.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/32_devedition.py
@@ -1,8 +1,6 @@
-import os
-
-MOZ_OBJDIR = 'obj-firefox'
-
 config = {
     'src_mozconfig': 'browser/config/mozconfigs/linux32/devedition',
     'base_name': 'Linux_%(branch)_devedition',
+    'force_clobber': True,
+    'stage_platform': 'linux-devedition',
 }
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_devedition.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_devedition.py
@@ -1,8 +1,6 @@
-import os
-
-MOZ_OBJDIR = 'obj-firefox'
-
 config = {
     'src_mozconfig': 'browser/config/mozconfigs/linux64/devedition',
     'base_name': 'Linux_x86-64_%(branch)_devedition',
+    'force_clobber': True,
+    'stage_platform': 'linux64-devedition',
 }
new file mode 100644
--- /dev/null
+++ b/testing/mozharness/configs/builds/releng_sub_mac_configs/64_devedition.py
@@ -0,0 +1,4 @@
+config = {
+    'force_clobber': True,
+    'stage_platform': 'macosx64-devedition',
+}
new file mode 100644
--- /dev/null
+++ b/testing/mozharness/configs/builds/releng_sub_windows_configs/32_devedition.py
@@ -0,0 +1,4 @@
+config = {
+    'force_clobber': True,
+    'stage_platform': 'win32-devedition',
+}
new file mode 100644
--- /dev/null
+++ b/testing/mozharness/configs/builds/releng_sub_windows_configs/64_devedition.py
@@ -0,0 +1,4 @@
+config = {
+    'force_clobber': True,
+    'stage_platform': 'win64-devedition',
+}