Bug 1501526 - Port bug 1497860: Move mozconfig_variant definitions to taskcluster config. rs=bustage-fix a=jorgk
authorRob Lemley <rob@thunderbird.net>
Wed, 24 Oct 2018 00:57:21 +0000
changeset 33479 ef64cd0986cdc9cebdf0bcce2d46297cf653a53c
parent 33478 477ff0b6232dbb5e3fd01ef22583ac0a005d63a4
child 33480 94d01c0399c9016ef9d91b284ff2f398c68a9580
push id387
push userclokep@gmail.com
push dateMon, 10 Dec 2018 21:30:47 +0000
reviewersbustage-fix, jorgk
bugs1501526, 1497860
Bug 1501526 - Port bug 1497860: Move mozconfig_variant definitions to taskcluster config. rs=bustage-fix a=jorgk Bug 1501526 - Follow-up: Use 'mozconfig-variant: debug' for Mac as well. rs=bustage-fix - set default mozconfig_variant in ci/build/kind.yml - mozconfig_variant overrides need to be moved from mozharness/build/branch_specfics.py to ci/build/{linux,macosx,windows}.yml - testing/mozharness/configs/builds/taskcluster_sub_win{32,64}/opt.py were removed from M-C, need to update ci/build/windows.yml, need to move those settings to ci/build/windows.yml
mozharness/builds/branch_specifics.py
taskcluster/ci/build/kind.yml
taskcluster/ci/build/linux.yml
taskcluster/ci/build/macosx.yml
taskcluster/ci/build/windows.yml
--- a/mozharness/builds/branch_specifics.py
+++ b/mozharness/builds/branch_specifics.py
@@ -29,51 +29,17 @@
 
 config = {
     "comm-central": {
         "repo_path": 'comm-central',
     },
     "comm-beta": {
         "enable_release_promotion": True,
         'repo_path': 'releases/comm-beta',
-        'platform_overrides': {
-            'linux': {
-                'mozconfig_variant': 'release',
-            },
-            'linux64': {
-                'mozconfig_variant': 'release',
-            },
-            'macosx64': {
-                'mozconfig_variant': 'release',
-            },
-            'win32': {
-                'mozconfig_variant': 'release',
-            },
-            'win64': {
-                'mozconfig_variant': 'release',
-            },
-        },
     },
     "comm-esr60": {
         "enable_release_promotion": True,
         'repo_path': 'releases/comm-esr60',
-        'platform_overrides': {
-            'linux': {
-                'mozconfig_variant': 'release',
-            },
-            'linux64': {
-                'mozconfig_variant': 'release',
-            },
-            'macosx64': {
-                'mozconfig_variant': 'release',
-            },
-            'win32': {
-                'mozconfig_variant': 'release',
-            },
-            'win64': {
-                'mozconfig_variant': 'release',
-            },
-        },
     },
     'try-comm-central': {
         'repo_path': 'try-comm-central',
     },
 }
--- a/taskcluster/ci/build/kind.yml
+++ b/taskcluster/ci/build/kind.yml
@@ -42,15 +42,20 @@ job-defaults:
             - comm/taskcluster
             - comm/testing
             - comm/.taskcluster.yml
             - comm/AUTHORS
             - comm/comm-confvars.sh
             - comm/moz.build
             - comm/moz.configure
     run:
+        mozconfig-variant:
+            by-release-type:
+                beta: beta
+                release.*: release
+                default: nightly
         # Note: These settings are only honored by nightly (i.e. shipping) builds
         update-channel:
             by-release-type:
                 nightly: nightly
                 beta: beta
                 release.*: release
                 default: null
--- a/taskcluster/ci/build/linux.yml
+++ b/taskcluster/ci/build/linux.yml
@@ -84,16 +84,17 @@ linux64/debug:
         actions: [build check-test]
         config-paths:
             - comm/mozharness
         config:
             - builds/taskcluster_base_thunderbird.py
             - builds/releng_base_linux_64_builds.py
         script: "mozharness/scripts/fx_desktop_build.py"
         custom-build-variant-cfg: debug
+        mozconfig-variant: debug
         need-xvfb: true
     toolchains:
         - linux64-cbindgen
         - linux64-clang
         - linux64-gcc
         - linux64-node
         - linux64-rust
         - linux64-sccache
@@ -184,16 +185,17 @@ linux/debug:
         actions: [build check-test]
         config-paths:
             - comm/mozharness
         config:
             - builds/taskcluster_base_thunderbird.py
             - builds/releng_base_linux_32_builds.py
         script: "mozharness/scripts/fx_desktop_build.py"
         custom-build-variant-cfg: debug
+        mozconfig-variant: debug
         need-xvfb: true
     toolchains:
         - linux64-cbindgen
         - linux64-clang
         - linux64-gcc
         - linux64-node
         - linux64-rust
         - linux64-sccache
--- a/taskcluster/ci/build/macosx.yml
+++ b/taskcluster/ci/build/macosx.yml
@@ -19,16 +19,17 @@ macosx64/debug:
         actions: [build]
         config-paths:
             - comm/mozharness
         config:
             - builds/taskcluster_base_thunderbird.py
             - builds/releng_base_mac_64_cross_builds.py
         script: "mozharness/scripts/fx_desktop_build.py"
         custom-build-variant-cfg: cross-debug
+        mozconfig-variant: debug
         tooltool-downloads: internal
     toolchains:
         - linux64-cbindgen
         - linux64-cctools-port
         - linux64-clang
         - linux64-hfsplus
         - linux64-libdmg
         - linux64-llvm-dsymutil
--- a/taskcluster/ci/build/windows.yml
+++ b/taskcluster/ci/build/windows.yml
@@ -19,17 +19,18 @@ win32/opt:
         options: [append-env-variables-from-configs]
         script: mozharness/scripts/fx_desktop_build.py
         config-paths:
             - comm/mozharness
         config:
             - builds/taskcluster_base_thunderbird.py
             - builds/taskcluster_base_windows.py
             - builds/taskcluster_base_win32.py
-            - builds/taskcluster_sub_win32/opt.py
+        extra-config:
+            stage_platform: win32
     toolchains:
         - win64-cbindgen
         - win64-clang-cl
         - win64-node
         - win64-rust
         - win64-sccache
 
 win32-nightly/opt:
@@ -59,18 +60,19 @@ win32-nightly/opt:
         options: [append-env-variables-from-configs]
         script: mozharness/scripts/fx_desktop_build.py
         config-paths:
             - comm/mozharness
         config:
             - builds/taskcluster_base_thunderbird.py
             - builds/taskcluster_base_windows.py
             - builds/taskcluster_base_win32.py
-            - builds/taskcluster_sub_win32/opt.py
             - taskcluster_nightly.py
+        extra-config:
+            stage_platform: win32
     toolchains:
         - win64-cbindgen
         - win64-clang-cl
         - win64-node
         - win64-rust
 
 win32/debug:
     description: "Win32 Debug"
@@ -94,16 +96,17 @@ win32/debug:
         script: mozharness/scripts/fx_desktop_build.py
         config-paths:
             - comm/mozharness
         config:
             - builds/taskcluster_base_thunderbird.py
             - builds/taskcluster_base_windows.py
             - builds/taskcluster_base_win32.py
             - builds/taskcluster_sub_win32/debug.py
+        mozconfig-variant: debug
     toolchains:
         - win64-cbindgen
         - win64-clang-cl
         - win64-node
         - win64-rust
         - win64-sccache
 
 win64/opt:
@@ -126,17 +129,18 @@ win64/opt:
         options: [append-env-variables-from-configs]
         script: mozharness/scripts/fx_desktop_build.py
         config-paths:
             - comm/mozharness
         config:
             - builds/taskcluster_base_thunderbird.py
             - builds/taskcluster_base_windows.py
             - builds/taskcluster_base_win64.py
-            - builds/taskcluster_sub_win64/opt.py
+        extra-config:
+            stage_platform: win64
     toolchains:
         - win64-cbindgen
         - win64-clang-cl
         - win64-node
         - win64-rust
         - win64-sccache
 
 win64-nightly/opt:
@@ -166,18 +170,19 @@ win64-nightly/opt:
         options: [append-env-variables-from-configs]
         script: mozharness/scripts/fx_desktop_build.py
         config-paths:
             - comm/mozharness
         config:
             - builds/taskcluster_base_thunderbird.py
             - builds/taskcluster_base_windows.py
             - builds/taskcluster_base_win64.py
-            - builds/taskcluster_sub_win64/opt.py
             - taskcluster_nightly.py
+        extra-config:
+            stage_platform: win64
     toolchains:
         - win64-cbindgen
         - win64-clang-cl
         - win64-node
         - win64-rust
 
 win64/debug:
     description: "Win64 Debug"
@@ -200,14 +205,15 @@ win64/debug:
         script: mozharness/scripts/fx_desktop_build.py
         config-paths:
             - comm/mozharness
         config:
             - builds/taskcluster_base_thunderbird.py
             - builds/taskcluster_base_windows.py
             - builds/taskcluster_base_win64.py
             - builds/taskcluster_sub_win64/debug.py
+        mozconfig-variant: debug
     toolchains:
         - win64-cbindgen
         - win64-clang-cl
         - win64-node
         - win64-rust
         - win64-sccache