Bug 1653171: Run windows L10n repacks on linux; r=Callek

Differential Revision: https://phabricator.services.mozilla.com/D85894
iaxat · Aug 4, 2020 · 52a0abe · 52a0abe
1 parent 622666f
commit 52a0abe
Show file tree

Hide file tree

Showing 12 changed files with 39 additions and 47 deletions.
diff --git a/browser/config/mozconfigs/win32/l10n-mozconfig b/browser/config/mozconfigs/win32/l10n-mozconfig
@@ -1,8 +1,7 @@
 . "$topsrcdir/browser/config/mozconfigs/common"
+. "$topsrcdir/browser/config/mozconfigs/win32/common-win32"
 . "$topsrcdir/build/mozconfig.no-compile"
 
-ac_add_options --target=i686-pc-mingw32
-
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --with-branding=browser/branding/nightly
 

diff --git a/browser/config/mozconfigs/win32/l10n-mozconfig-devedition b/browser/config/mozconfigs/win32/l10n-mozconfig-devedition
@@ -1,8 +1,7 @@
 . "$topsrcdir/browser/config/mozconfigs/common"
+. "$topsrcdir/browser/config/mozconfigs/win32/common-win32"
 . "$topsrcdir/build/mozconfig.no-compile"
 
-ac_add_options --target=i686-pc-mingw32
-
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --with-branding=browser/branding/aurora
 

diff --git a/taskcluster/ci/l10n/kind.yml b/taskcluster/ci/l10n/kind.yml
@@ -14,6 +14,7 @@ transforms:
 kind-dependencies:
     - build
     - build-signing
+    - fetch
     - repackage
     - toolchain
 
@@ -37,7 +38,7 @@ job-template:
     run-time:
         by-build-platform:
             default: 900
-            win.*: 2700
+            win.*: 1800
     secrets: false
     fetches:
         toolchain:
@@ -46,6 +47,15 @@ job-template:
                 macosx64.*:
                     - linux64-libdmg
                     - linux64-hfsplus
+                win.*:
+                    - linux64-wine
+                    - linux64-liblowercase
+        fetch:
+            by-build-platform:
+                default: []
+                win.*:
+                    - nsis-3.01-win
+                    - upx-3.95-win
     tooltool:
         by-build-platform:
             default: internal
@@ -64,10 +74,11 @@ job-template:
         by-build-platform:
             linux-shippable.*: ['release']  # Do not run on autoland - Bug 1599197
             default: ['all']
-    worker-type:
+    worker-type: b-linux
+    docker-image:
         by-build-platform:
-            default: b-linux
-            win.*: b-win2012
+            linux.*: {in-tree: debian8-amd64-build}
+            default: {in-tree: debian10-amd64-build}
     treeherder:
         symbol: L10n
         tier: 1

diff --git a/taskcluster/ci/shippable-l10n/kind.yml b/taskcluster/ci/shippable-l10n/kind.yml
@@ -14,6 +14,7 @@ transforms:
 kind-dependencies:
     - build
     - build-signing
+    - fetch
     - repackage
     - toolchain
 
@@ -48,14 +49,23 @@ job-template:
     run-time:
         by-build-platform:
             default: 900
-            win.*: 2700
+            win.*: 1800
     fetches:
         toolchain:
             by-build-platform:
                 default: []
                 macosx64.*:
                     - linux64-libdmg
                     - linux64-hfsplus
+                win.*:
+                    - linux64-wine
+                    - linux64-liblowercase
+        fetch:
+            by-build-platform:
+                default: []
+                win.*:
+                    - nsis-3.01-win
+                    - upx-3.95-win
     tooltool:
         by-build-platform:
             default: internal
@@ -80,10 +90,11 @@ job-template:
                 win32-devedition: win32-devedition-opt
                 win64-devedition: win64-devedition-opt
                 win64-aarch64-devedition: win64-aarch64-devedition-opt
-    worker-type:
+    worker-type: b-linux
+    docker-image:
         by-build-platform:
-            default: b-linux
-            win.*: b-win2012
+            linux.*: {in-tree: debian8-amd64-build}
+            default: {in-tree: debian10-amd64-build}
     treeherder:
         symbol: L10n(B)
         tier: 1

diff --git a/taskcluster/taskgraph/transforms/l10n.py b/taskcluster/taskgraph/transforms/l10n.py
@@ -238,6 +238,7 @@ def handle_keyed_by(config, jobs):
         "docker-image",
         "secrets",
         "fetches.toolchain",
+        "fetches.fetch",
         "tooltool",
         "env",
         "ignore-locales",

diff --git a/testing/mozharness/configs/single_locale/tc_android-api-16.py b/testing/mozharness/configs/single_locale/tc_android-api-16.py
@@ -14,9 +14,6 @@
         "output_dir": "%(abs_work_dir)s/src",
     },
 
-    "upload_env": {
-        'UPLOAD_PATH': '/builds/worker/artifacts/',
-    },
     'secret_files': [
         {'filename': '/builds/gls-gapi.data',
          'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/gls-gapi.data',

diff --git a/testing/mozharness/configs/single_locale/tc_common.py b/testing/mozharness/configs/single_locale/tc_common.py
@@ -1,3 +1,7 @@
 config = {
     "simple_name_move": True,
+    "vcs_share_base": "/builds/hg-shared",
+    "upload_env": {
+        'UPLOAD_PATH': '/builds/worker/artifacts/',
+    },
 }
diff --git a/testing/mozharness/configs/single_locale/tc_linux32.py b/testing/mozharness/configs/single_locale/tc_linux32.py
@@ -9,7 +9,4 @@
         "L10NBASEDIR": "../../l10n",
         'TOOLTOOL_CACHE': os.environ.get('TOOLTOOL_CACHE'),
     },
-    "upload_env": {
-        'UPLOAD_PATH': '/builds/worker/artifacts/',
-    },
 }
diff --git a/testing/mozharness/configs/single_locale/tc_linux_common.py b/testing/mozharness/configs/single_locale/tc_linux_common.py
@@ -9,9 +9,4 @@
         "L10NBASEDIR": "../../l10n",
         'TOOLTOOL_CACHE': os.environ.get('TOOLTOOL_CACHE'),
     },
-    "upload_env": {
-        'UPLOAD_PATH': '/builds/worker/artifacts/',
-    },
-
-    "vcs_share_base": "/builds/hg-shared",
 }
diff --git a/testing/mozharness/configs/single_locale/tc_macosx64.py b/testing/mozharness/configs/single_locale/tc_macosx64.py
@@ -9,10 +9,5 @@
         "L10NBASEDIR": "../../l10n",
         'TOOLTOOL_CACHE': os.environ.get('TOOLTOOL_CACHE'),
     },
-    "upload_env": {
-        'UPLOAD_PATH': '/builds/worker/artifacts/',
-    },
-
-    "vcs_share_base": "/builds/hg-shared",
 }
 
diff --git a/testing/mozharness/configs/single_locale/tc_win32.py b/testing/mozharness/configs/single_locale/tc_win32.py
@@ -1,23 +1,15 @@
 import os
 
 config = {
-    'vcs_share_base': os.path.join('y:', os.sep, 'hg-shared'),
     "bootstrap_env": {
         "NO_MERCURIAL_SETUP_CHECK": "1",
         "MOZ_OBJDIR": "%(abs_obj_dir)s",
         "EN_US_BINARY_URL": os.environ["EN_US_BINARY_URL"],
         "DIST": "%(abs_obj_dir)s",
         "L10NBASEDIR": "../../l10n",
-        'TOOLTOOL_CACHE': os.environ.get('TOOLTOOL_CACHE', 'c:/builds/tooltool_cache'),
+        'TOOLTOOL_CACHE': os.environ.get('TOOLTOOL_CACHE'),
         'EN_US_PACKAGE_NAME': 'target.zip',
     },
-    "upload_env": {
-        'UPLOAD_PATH': os.path.join(os.getcwd(), 'public', 'build'),
-    },
 
     'tooltool_manifest_src': "browser/config/tooltool-manifests/win32/releng.manifest",
-
-    # use mozmake?
-    "enable_mozmake": True,
-    'exes': {}
 }
diff --git a/testing/mozharness/configs/single_locale/tc_win64.py b/testing/mozharness/configs/single_locale/tc_win64.py
@@ -1,24 +1,15 @@
 import os
 
 config = {
-    'vcs_share_base': os.path.join('y:', os.sep, 'hg-shared'),
     "bootstrap_env": {
         "NO_MERCURIAL_SETUP_CHECK": "1",
         "MOZ_OBJDIR": "%(abs_obj_dir)s",
         "EN_US_BINARY_URL": os.environ["EN_US_BINARY_URL"],
         "DIST": "%(abs_obj_dir)s",
         "L10NBASEDIR": "../../l10n",
-        'TOOLTOOL_CACHE': os.environ.get('TOOLTOOL_CACHE', 'c:/builds/tooltool_cache'),
+        'TOOLTOOL_CACHE': os.environ.get('TOOLTOOL_CACHE'),
         'EN_US_PACKAGE_NAME': 'target.zip',
     },
-    "upload_env": {
-        'UPLOAD_PATH': os.path.join(os.getcwd(), 'public', 'build'),
-    },
 
     'tooltool_manifest_src': "browser/config/tooltool-manifests/win64/releng.manifest",
-
-    # use mozmake?
-    "enable_mozmake": True,
-    'exes': {},
 }
-