Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

10 files changed, 159 insertions, 312 deletions

diff --git a/testing/mozharness/configs/l10n_bumper/jamun.py b/testing/mozharness/configs/l10n_bumper/jamun.py
deleted file mode 100644
index 355f82073a..0000000000
--- a/testing/mozharness/configs/l10n_bumper/jamun.py
+++ /dev/null
@@ -1,83 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-import sys
-
-MULTI_REPO = "projects/jamun"
-EXES = {}
-if sys.platform.startswith("linux"):
-    EXES = {
-        # Get around the https warnings
-        "hg": [
-            "/usr/local/bin/hg",
-            "--config",
-            "web.cacerts=/etc/pki/tls/certs/ca-bundle.crt",
-        ],
-        "hgtool.py": ["/usr/local/bin/hgtool.py"],
-    }
-
-
-config = {
-    "log_name": "l10n_bumper",
-    "log_type": "multi",
-    "exes": EXES,
-    "gecko_pull_url": "https://hg.mozilla.org/{}".format(MULTI_REPO),
-    "gecko_push_url": "ssh://hg.mozilla.org/{}".format(MULTI_REPO),
-    "hg_user": "L10n Bumper Bot <release+l10nbumper@mozilla.com>",
-    "ssh_key": "~/.ssh/ffxbld_rsa",
-    "ssh_user": "ffxbld",
-    "vcs_share_base": "/builds/hg-shared",
-    "version_path": "browser/config/version.txt",
-    "status_path": ".l10n_bumper_status",
-    "bump_configs": [
-        {
-            "path": "mobile/locales/l10n-changesets.json",
-            "format": "json",
-            "name": "Fennec l10n changesets",
-            "revision_url": "https://l10n.mozilla.org/shipping/l10n-changesets?av=fennec%(MAJOR_VERSION)s",
-            "platform_configs": [
-                {
-                    "platforms": ["android-arm", "android"],
-                    "path": "mobile/android/locales/all-locales",
-                },
-                {
-                    "platforms": ["android-multilocale"],
-                    "path": "mobile/android/locales/maemo-locales",
-                },
-            ],
-        },
-        {
-            "path": "browser/locales/l10n-changesets.json",
-            "format": "json",
-            "name": "Firefox l10n changesets",
-            "revision_url": "https://l10n.mozilla.org/shipping/l10n-changesets?av=fx%(MAJOR_VERSION)s",
-            "ignore_config": {
-                "ja": ["macosx64"],
-                "ja-JP-mac": ["linux", "linux64", "win32", "win64"],
-            },
-            "platform_configs": [
-                {
-                    "platforms": ["linux64", "linux", "macosx64", "win32", "win64"],
-                    "path": "browser/locales/shipped-locales",
-                    "format": "shipped-locales",
-                }
-            ],
-        },
-        {
-            "path": "browser/locales/central-changesets.json",
-            "format": "json",
-            "name": "Firefox l10n changesets",
-            "ignore_config": {
-                "ja": ["macosx64"],
-                "ja-JP-mac": ["linux", "linux64", "win32", "win64"],
-            },
-            "platform_configs": [
-                {
-                    "platforms": ["linux64", "linux", "macosx64", "win32", "win64"],
-                    "path": "browser/locales/all-locales",
-                }
-            ],
-        },
-    ],
-}
diff --git a/testing/mozharness/configs/l10n_bumper/mozilla-beta.py b/testing/mozharness/configs/l10n_bumper/mozilla-beta.py
deleted file mode 100644
index 4ba7add5de..0000000000
--- a/testing/mozharness/configs/l10n_bumper/mozilla-beta.py
+++ /dev/null
@@ -1,87 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-import sys
-
-MULTI_REPO = "releases/mozilla-beta"
-EXES = {}
-if sys.platform.startswith("linux"):
-    EXES = {
-        # Get around the https warnings
-        "hg": [
-            "/usr/local/bin/hg",
-            "--config",
-            "web.cacerts=/etc/pki/tls/certs/ca-bundle.crt",
-        ],
-        "hgtool.py": ["/usr/local/bin/hgtool.py"],
-    }
-
-config = {
-    "log_name": "l10n_bumper",
-    "log_type": "multi",
-    "exes": EXES,
-    "gecko_pull_url": "https://hg.mozilla.org/{}".format(MULTI_REPO),
-    "gecko_push_url": "ssh://hg.mozilla.org/{}".format(MULTI_REPO),
-    "hg_user": "L10n Bumper Bot <release+l10nbumper@mozilla.com>",
-    "ssh_key": "~/.ssh/ffxbld_rsa",
-    "ssh_user": "ffxbld",
-    "vcs_share_base": "/builds/hg-shared",
-    "version_path": "browser/config/version.txt",
-    "status_path": ".l10n_bumper_status",
-    "bump_configs": [
-        {
-            "path": "mobile/locales/l10n-changesets.json",
-            "format": "json",
-            "name": "Fennec l10n changesets",
-            "revision_url": "https://l10n.mozilla.org/shipping/l10n-changesets?av=fennec%(MAJOR_VERSION)s",
-            "platform_configs": [
-                {
-                    "platforms": ["android-multilocale"],
-                    "path": "mobile/android/locales/maemo-locales",
-                }
-            ],
-        },
-        {
-            "path": "browser/locales/l10n-changesets.json",
-            "format": "json",
-            "name": "Firefox l10n changesets",
-            "revision_url": "https://l10n.mozilla.org/shipping/l10n-changesets?av=fx%(MAJOR_VERSION)s",
-            "ignore_config": {
-                "ja": ["macosx64", "macosx64-devedition"],
-                "ja-JP-mac": [
-                    "linux",
-                    "linux-devedition",
-                    "linux64",
-                    "linux64-devedition",
-                    "win32",
-                    "win32-devedition",
-                    "win64",
-                    "win64-devedition",
-                    "win64-aarch64",
-                    "win64-aarch64-devedition",
-                ],
-            },
-            "platform_configs": [
-                {
-                    "platforms": [
-                        "linux",
-                        "linux-devedition",
-                        "linux64",
-                        "linux64-devedition",
-                        "macosx64",
-                        "macosx64-devedition",
-                        "win32",
-                        "win32-devedition",
-                        "win64",
-                        "win64-devedition",
-                        "win64-aarch64",
-                        "win64-aarch64-devedition",
-                    ],
-                    "path": "browser/locales/shipped-locales",
-                    "format": "shipped-locales",
-                }
-            ],
-        },
-    ],
-}
diff --git a/testing/mozharness/configs/l10n_bumper/mozilla-central.py b/testing/mozharness/configs/l10n_bumper/mozilla-central.py
deleted file mode 100644
index b2bcc1b98f..0000000000
--- a/testing/mozharness/configs/l10n_bumper/mozilla-central.py
+++ /dev/null
@@ -1,88 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-import sys
-
-MULTI_REPO = "mozilla-central"
-EXES = {}
-if sys.platform.startswith("linux"):
-    EXES = {
-        # Get around the https warnings
-        "hg": [
-            "/usr/local/bin/hg",
-            "--config",
-            "web.cacerts=/etc/pki/tls/certs/ca-bundle.crt",
-        ],
-        "hgtool.py": ["/usr/local/bin/hgtool.py"],
-    }
-
-config = {
-    "log_name": "l10n_bumper",
-    "log_type": "multi",
-    "exes": EXES,
-    "gecko_pull_url": "https://hg.mozilla.org/{}".format(MULTI_REPO),
-    "gecko_push_url": "ssh://hg.mozilla.org/{}".format(MULTI_REPO),
-    "hg_user": "L10n Bumper Bot <release+l10nbumper@mozilla.com>",
-    "ssh_key": "~/.ssh/ffxbld_rsa",
-    "ssh_user": "ffxbld",
-    "vcs_share_base": "/builds/hg-shared",
-    "version_path": "browser/config/version.txt",
-    "status_path": ".l10n_bumper_status",
-    "bump_configs": [
-        {
-            "path": "mobile/locales/l10n-changesets.json",
-            "format": "json",
-            "name": "Fennec l10n changesets",
-            "platform_configs": [
-                {
-                    "platforms": ["android-arm", "android"],
-                    "path": "mobile/android/locales/all-locales",
-                },
-                {
-                    "platforms": ["android-multilocale"],
-                    "path": "mobile/android/locales/maemo-locales",
-                },
-            ],
-        },
-        {
-            "path": "browser/locales/l10n-changesets.json",
-            "format": "json",
-            "name": "Firefox l10n changesets",
-            "ignore_config": {
-                "ja": ["macosx64", "macosx64-devedition"],
-                "ja-JP-mac": [
-                    "linux",
-                    "linux-devedition",
-                    "linux64",
-                    "linux64-devedition",
-                    "win32",
-                    "win32-devedition",
-                    "win64",
-                    "win64-devedition",
-                    "win64-aarch64",
-                    "win64-aarch64-devedition",
-                ],
-            },
-            "platform_configs": [
-                {
-                    "platforms": [
-                        "linux",
-                        "linux-devedition",
-                        "linux64",
-                        "linux64-devedition",
-                        "macosx64",
-                        "macosx64-devedition",
-                        "win32",
-                        "win32-devedition",
-                        "win64",
-                        "win64-devedition",
-                        "win64-aarch64",
-                        "win64-aarch64-devedition",
-                    ],
-                    "path": "browser/locales/all-locales",
-                }
-            ],
-        },
-    ],
-}
diff --git a/testing/mozharness/configs/l10n_bumper/mozilla-esr68.py b/testing/mozharness/configs/l10n_bumper/mozilla-esr68.py
deleted file mode 100644
index 01a7c85e2d..0000000000
--- a/testing/mozharness/configs/l10n_bumper/mozilla-esr68.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-import sys
-
-MULTI_REPO = "releases/mozilla-esr68"
-EXES = {}
-if sys.platform.startswith("linux"):
-    EXES = {
-        # Get around the https warnings
-        "hg": [
-            "/usr/local/bin/hg",
-            "--config",
-            "web.cacerts=/etc/pki/tls/certs/ca-bundle.crt",
-        ],
-        "hgtool.py": ["/usr/local/bin/hgtool.py"],
-    }
-
-config = {
-    "log_name": "l10n_bumper",
-    "log_type": "multi",
-    "exes": EXES,
-    "gecko_pull_url": "https://hg.mozilla.org/{}".format(MULTI_REPO),
-    "gecko_push_url": "ssh://hg.mozilla.org/{}".format(MULTI_REPO),
-    "hg_user": "L10n Bumper Bot <release+l10nbumper@mozilla.com>",
-    "ssh_key": "~/.ssh/ffxbld_rsa",
-    "ssh_user": "ffxbld",
-    "vcs_share_base": "/builds/hg-shared",
-    "version_path": "mobile/android/config/version-files/release/version.txt",
-    "status_path": ".l10n_bumper_status",
-    "bump_configs": [
-        {
-            "path": "mobile/locales/l10n-changesets.json",
-            "format": "json",
-            "name": "Fennec l10n changesets",
-            "revision_url": "https://l10n.mozilla.org/shipping/l10n-changesets?av=fennec%(COMBINED_MAJOR_VERSION)s",
-            "platform_configs": [
-                {
-                    "platforms": ["android-multilocale"],
-                    "path": "mobile/android/locales/maemo-locales",
-                }
-            ],
-        }
-    ],
-}
diff --git a/testing/mozharness/configs/marionette/windows_taskcluster_config.py b/testing/mozharness/configs/marionette/windows_taskcluster_config.py
index a503885c66..324a89708e 100644
--- a/testing/mozharness/configs/marionette/windows_taskcluster_config.py
+++ b/testing/mozharness/configs/marionette/windows_taskcluster_config.py
@@ -17,8 +17,8 @@ DESKTOP_VISUALFX_THEME = {
     "Custom": 3,
 }.get("Best appearance")
 TASKBAR_AUTOHIDE_REG_PATH = {
-    "Windows 7": "HKCU:SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\StuckRects2",
-    "Windows 10": "HKCU:SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\StuckRects3",
+    "Windows 7": r"HKCU:SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\StuckRects2",
+    "Windows 10": r"HKCU:SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\StuckRects3",
 }.get("{} {}".format(platform.system(), platform.release()))
 
 #####
@@ -99,7 +99,7 @@ config = {
             "cmd": [
                 "powershell",
                 "-command",
-                "\"&{{&Set-ItemProperty -Path 'HKCU:Software\Microsoft\Windows\CurrentVersion\Explorer\VisualEffects' -Name VisualFXSetting -Value {}}}\"".format(
+                "\"&{{&Set-ItemProperty -Path 'HKCU:Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\VisualEffects' -Name VisualFXSetting -Value {}}}\"".format(
                     DESKTOP_VISUALFX_THEME
                 ),
             ],
@@ -112,7 +112,7 @@ config = {
             "cmd": [
                 "powershell",
                 "-command",
-                "New-ItemProperty -Path 'HKCU:\Control Panel\Accessibility' -Name 'DynamicScrollbars' -Value 0",
+                r"New-ItemProperty -Path 'HKCU:\Control Panel\Accessibility' -Name 'DynamicScrollbars' -Value 0",
             ],
             "architectures": ["32bit", "64bit"],
             "halt_on_failure": False,
diff --git a/testing/mozharness/configs/raptor/android_hw_external_browser_config.py b/testing/mozharness/configs/raptor/android_hw_external_browser_config.py
new file mode 100644
index 0000000000..36f3ced4d8
--- /dev/null
+++ b/testing/mozharness/configs/raptor/android_hw_external_browser_config.py
@@ -0,0 +1,26 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import os
+
+config = {
+    "log_name": "raptor",
+    "title": os.uname()[1].lower().split(".")[0],
+    "default_actions": [
+        "clobber",
+        "download-and-extract",
+        "populate-webroot",
+        "create-virtualenv",
+        "install-chrome-android",
+        "install-chromium-distribution",
+        "run-tests",
+    ],
+    "tooltool_cache": "/builds/tooltool_cache",
+    "download_tooltool": True,
+    "hostutils_manifest_path": "testing/config/tooltool-manifests/linux64/hostutils.manifest",
+}
+
+# raptor will pick these up in mitmproxy.py, doesn't use the mozharness config
+os.environ["TOOLTOOLCACHE"] = config["tooltool_cache"]
+os.environ["HOSTUTILS_MANIFEST_PATH"] = config["hostutils_manifest_path"]
diff --git a/testing/mozharness/configs/raptor/linux_external_browser_config.py b/testing/mozharness/configs/raptor/linux_external_browser_config.py
new file mode 100644
index 0000000000..9db0eb358c
--- /dev/null
+++ b/testing/mozharness/configs/raptor/linux_external_browser_config.py
@@ -0,0 +1,23 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import os
+
+VENV_PATH = "%s/build/venv" % os.getcwd()
+
+config = {
+    "log_name": "raptor",
+    "installer_path": "installer.exe",
+    "virtualenv_path": VENV_PATH,
+    "title": os.uname()[1].lower().split(".")[0],
+    "default_actions": [
+        "clobber",
+        "download-and-extract",
+        "populate-webroot",
+        "create-virtualenv",
+        "install-chromium-distribution",
+        "run-tests",
+    ],
+    "tooltool_cache": "/builds/tooltool_cache",
+}
diff --git a/testing/mozharness/configs/raptor/mac_external_browser_config.py b/testing/mozharness/configs/raptor/mac_external_browser_config.py
new file mode 100644
index 0000000000..2e5a83e10e
--- /dev/null
+++ b/testing/mozharness/configs/raptor/mac_external_browser_config.py
@@ -0,0 +1,26 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import os
+
+VENV_PATH = "%s/build/venv" % os.getcwd()
+
+config = {
+    "log_name": "raptor",
+    "installer_path": "installer.exe",
+    "virtualenv_path": VENV_PATH,
+    "title": os.uname()[1].lower().split(".")[0],
+    "default_actions": [
+        "clobber",
+        "download-and-extract",
+        "populate-webroot",
+        "create-virtualenv",
+        "install-chromium-distribution",
+        "run-tests",
+    ],
+    "run_cmd_checks_enabled": True,
+    "preflight_run_cmd_suites": [],
+    "postflight_run_cmd_suites": [],
+    "tooltool_cache": "/builds/tooltool_cache",
+}
diff --git a/testing/mozharness/configs/raptor/windows_external_browser_config.py b/testing/mozharness/configs/raptor/windows_external_browser_config.py
new file mode 100644
index 0000000000..56bb6708d6
--- /dev/null
+++ b/testing/mozharness/configs/raptor/windows_external_browser_config.py
@@ -0,0 +1,76 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import os
+import socket
+import sys
+
+PYTHON = sys.executable
+VENV_PATH = os.path.join(os.getcwd(), "build/venv")
+
+PYWIN32 = "pywin32==306"
+
+config = {
+    "log_name": "raptor",
+    "installer_path": "installer.exe",
+    "virtualenv_path": VENV_PATH,
+    "virtualenv_modules": [PYWIN32, "raptor", "mozinstall"],
+    "exes": {
+        "python": PYTHON,
+        "mozinstall": [
+            "%s/scripts/python" % VENV_PATH,
+            "%s/scripts/mozinstall-script.py" % VENV_PATH,
+        ],
+        "hg": os.path.join(os.environ["PROGRAMFILES"], "Mercurial", "hg"),
+        "tooltool.py": [
+            PYTHON,
+            os.path.join(os.environ["MOZILLABUILD"], "tooltool.py"),
+        ],
+    },
+    "title": socket.gethostname().split(".")[0],
+    "default_actions": [
+        "clobber",
+        "download-and-extract",
+        "populate-webroot",
+        "create-virtualenv",
+        "install-chromium-distribution",
+        "run-tests",
+    ],
+    "tooltool_cache": os.path.join("c:\\", "build", "tooltool_cache"),
+    "python3_manifest": {
+        "win32": "python3.manifest",
+        "win64": "python3_x64.manifest",
+    },
+    "env": {
+        # python3 requires C runtime, found in firefox installation; see bug 1361732
+        "PATH": "%(PATH)s;c:\\slave\\test\\build\\application\\firefox;"
+    },
+    "run_cmd_checks_enabled": True,
+    "preflight_run_cmd_suites": [
+        {
+            "name": "run mouse & screen adjustment script",
+            "cmd": [
+                sys.executable,
+                os.path.join(
+                    os.getcwd(),
+                    "mozharness",
+                    "external_tools",
+                    "mouse_and_screen_resolution.py",
+                ),
+                "--configuration-file",
+                os.path.join(
+                    os.getcwd(),
+                    "mozharness",
+                    "external_tools",
+                    "machine-configuration.json",
+                ),
+                "--platform",
+                "win10-hw",
+            ],
+            "architectures": ["32bit", "64bit"],
+            "halt_on_failure": True,
+            "enabled": True,
+        }
+    ],
+}
diff --git a/testing/mozharness/configs/web_platform_tests/prod_config_windows_taskcluster.py b/testing/mozharness/configs/web_platform_tests/prod_config_windows_taskcluster.py
index 7e84f69be4..537efb9632 100644
--- a/testing/mozharness/configs/web_platform_tests/prod_config_windows_taskcluster.py
+++ b/testing/mozharness/configs/web_platform_tests/prod_config_windows_taskcluster.py
@@ -20,8 +20,8 @@ DESKTOP_VISUALFX_THEME = {
     "Custom": 3,
 }.get("Best appearance")
 TASKBAR_AUTOHIDE_REG_PATH = {
-    "Windows 7": "HKCU:SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\StuckRects2",
-    "Windows 10": "HKCU:SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\StuckRects3",
+    "Windows 7": r"HKCU:SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\StuckRects2",
+    "Windows 10": r"HKCU:SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\StuckRects3",
 }.get("{} {}".format(platform.system(), platform.release()))
 #####
 
@@ -85,7 +85,7 @@ config = {
             "cmd": [
                 "powershell",
                 "-command",
-                "\"&{{&Set-ItemProperty -Path 'HKCU:Software\Microsoft\Windows\CurrentVersion\Explorer\VisualEffects' -Name VisualFXSetting -Value {}}}\"".format(
+                "\"&{{&Set-ItemProperty -Path 'HKCU:Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\VisualEffects' -Name VisualFXSetting -Value {}}}\"".format(
                     DESKTOP_VISUALFX_THEME
                 ),
             ],
@@ -98,7 +98,7 @@ config = {
             "cmd": [
                 "powershell",
                 "-command",
-                "New-ItemProperty -Path 'HKCU:\Control Panel\Accessibility' -Name 'DynamicScrollbars' -Value 0",
+                r"New-ItemProperty -Path 'HKCU:\Control Panel\Accessibility' -Name 'DynamicScrollbars' -Value 0",
             ],
             "architectures": ["32bit", "64bit"],
             "halt_on_failure": False,