bug 1358601: set up CI builds and tests for DevEdition on mozilla-beta - fix stage_platform, clobbers, and update_channel. r=asasaki
authorBen Hearsum <bhearsum@mozilla.com>
Mon, 01 May 2017 09:31:09 -0400
changeset 390030 4d047de7284305c351ad9422b8d913292ca37bb0
parent 390029 bf749aa49b8344a31d3ad6f7407d64b3e0d5f698
child 390033 fe7c7044d656dfb2ec0a52d7246852b21ea4edf2
push id51
push userfmarier@mozilla.com
push dateFri, 05 May 2017 18:41:45 +0000
reviewersasasaki
bugs1358601
milestone55.0a1
bug 1358601: set up CI builds and tests for DevEdition on mozilla-beta - fix stage_platform, clobbers, and update_channel. r=asasaki 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.
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',
+}