Adding upstream version 126.0.upstream/126.0

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

6 files changed, 49 insertions, 38 deletions

diff --git a/tools/tryselect/selectors/chooser/app.py b/tools/tryselect/selectors/chooser/app.py
index 99d63cd37f..2e9e2d5ab0 100644
--- a/tools/tryselect/selectors/chooser/app.py
+++ b/tools/tryselect/selectors/chooser/app.py
@@ -107,6 +107,23 @@ class Test(Section):
 
 
 @register_section
+class Android(Section):
+    name = "android"
+    kind = (
+        "build-apk,build-bundle,build-components,test-apk,test-components,ui-test-apk"
+    )
+    title = "Firefox for Android"
+    attrs = ["kind", "build-type", "component", "shipping-product"]
+
+    def labelfn(self, task):
+        if task["kind"] in ("build-components", "test-components"):
+            label = "{}-{}".format(task["kind"], task.get("component"))
+        else:
+            label = "{}-{}".format(task["kind"], task.get("build-type"))
+        return label
+
+
+@register_section
 class Perf(Section):
     name = "perf"
     kind = "test"
diff --git a/tools/tryselect/selectors/chooser/static/filter.js b/tools/tryselect/selectors/chooser/static/filter.js
index 2d8731e61f..683ced8953 100644
--- a/tools/tryselect/selectors/chooser/static/filter.js
+++ b/tools/tryselect/selectors/chooser/static/filter.js
@@ -10,7 +10,7 @@ const pluralize = (count, noun, suffix = "s") =>
 var selected = [];
 
 var updateLabels = () => {
-  $(".tab-pane.active > .filter-label").each(function (index) {
+  $(".tab-pane.active > .filter-label").each(function () {
     let box = $("#" + this.htmlFor)[0];
     let method = box.checked ? "add" : "remove";
     $(this)[method + "Class"]("is-checked");
@@ -21,7 +21,7 @@ var apply = () => {
   let filters = {};
   let kinds = [];
 
-  $(".filter:checked").each(function (index) {
+  $(".filter:checked").each(function () {
     for (let kind of this.name.split(",")) {
       if (!kinds.includes(kind)) {
         kinds.push(kind);
@@ -76,7 +76,7 @@ var apply = () => {
 var applyChunks = () => {
   // For tasks that have a chunk filter applied, we handle that here.
   let filters = {};
-  $(".filter:text").each(function (index) {
+  $(".filter:text").each(function () {
     let value = $(this).val();
     if (value === "") {
       return;
diff --git a/tools/tryselect/selectors/chooser/static/select.js b/tools/tryselect/selectors/chooser/static/select.js
index 8a315c0a52..e90744a09a 100644
--- a/tools/tryselect/selectors/chooser/static/select.js
+++ b/tools/tryselect/selectors/chooser/static/select.js
@@ -39,7 +39,7 @@ labels.click(function (e) {
 
 function selectAll(btn) {
   let checked = !!btn.value;
-  $("div.active label.filter-label").each(function (index) {
+  $("div.active label.filter-label").each(function () {
     $(this).find("input:checkbox")[0].checked = checked;
   });
   apply();
diff --git a/tools/tryselect/selectors/perf.py b/tools/tryselect/selectors/perf.py
index 261905d5a3..e8a6e6f9cc 100644
--- a/tools/tryselect/selectors/perf.py
+++ b/tools/tryselect/selectors/perf.py
@@ -127,19 +127,6 @@ class PerfParser(CompareParser):
             },
         ],
         [
-            # Bug 1866047 - Remove once monorepo changes are complete
-            ["--fenix"],
-            {
-                "action": "store_true",
-                "default": False,
-                "help": "Include Fenix in tasks to run (disabled by default). Must "
-                "be used in conjunction with --android. Fenix isn't built on mozilla-central "
-                "so we pull the APK being tested from the firefox-android project. This "
-                "means that the fenix APK being tested in the two pushes is the same, and "
-                "any local changes made won't impact it.",
-            },
-        ],
-        [
             ["--chrome"],
             {
                 "action": "store_true",
diff --git a/tools/tryselect/selectors/perfselector/classification.py b/tools/tryselect/selectors/perfselector/classification.py
index cabf2a323e..a8e2adc034 100644
--- a/tools/tryselect/selectors/perfselector/classification.py
+++ b/tools/tryselect/selectors/perfselector/classification.py
@@ -31,13 +31,12 @@ class Platforms(ClassificationEnum):
 class Apps(ClassificationEnum):
     FIREFOX = {"value": "firefox", "index": 0}
     CHROME = {"value": "chrome", "index": 1}
-    CHROMIUM = {"value": "chromium", "index": 2}
-    GECKOVIEW = {"value": "geckoview", "index": 3}
-    FENIX = {"value": "fenix", "index": 4}
-    CHROME_M = {"value": "chrome-m", "index": 5}
-    SAFARI = {"value": "safari", "index": 6}
-    CHROMIUM_RELEASE = {"value": "custom-car", "index": 7}
-    CHROMIUM_RELEASE_M = {"value": "cstm-car-m", "index": 8}
+    GECKOVIEW = {"value": "geckoview", "index": 2}
+    FENIX = {"value": "fenix", "index": 3}
+    CHROME_M = {"value": "chrome-m", "index": 4}
+    SAFARI = {"value": "safari", "index": 5}
+    CHROMIUM_RELEASE = {"value": "custom-car", "index": 6}
+    CHROMIUM_RELEASE_M = {"value": "cstm-car-m", "index": 7}
 
 
 class Suites(ClassificationEnum):
@@ -66,10 +65,6 @@ def check_for_android(android=False, **kwargs):
     return android
 
 
-def check_for_fenix(fenix=False, **kwargs):
-    return fenix or ("fenix" in kwargs.get("requested_apps", []))
-
-
 def check_for_chrome(chrome=False, **kwargs):
     return chrome
 
@@ -137,12 +132,6 @@ class ClassificationProvider:
                 "restriction": check_for_chrome,
                 "platforms": [Platforms.DESKTOP.value],
             },
-            Apps.CHROMIUM.value: {
-                "query": "'chromium",
-                "negation": "!chrom",
-                "restriction": check_for_chrome,
-                "platforms": [Platforms.DESKTOP.value],
-            },
             Apps.GECKOVIEW.value: {
                 "query": "'geckoview",
                 "negation": "!geckoview",
@@ -151,7 +140,6 @@ class ClassificationProvider:
             Apps.FENIX.value: {
                 "query": "'fenix",
                 "negation": "!fenix",
-                "restriction": check_for_fenix,
                 "platforms": [Platforms.ANDROID.value],
             },
             Apps.CHROME_M.value: {
@@ -207,7 +195,6 @@ class ClassificationProvider:
                 "apps": [  # XXX No live CaR tests
                     Apps.FIREFOX.value,
                     Apps.CHROME.value,
-                    Apps.CHROMIUM.value,
                     Apps.FENIX.value,
                     Apps.GECKOVIEW.value,
                     Apps.SAFARI.value,
@@ -304,7 +291,6 @@ class ClassificationProvider:
                     Suites.RAPTOR.value: [
                         Apps.FIREFOX.value,
                         Apps.CHROME.value,
-                        Apps.CHROMIUM.value,
                         Apps.FENIX.value,
                         Apps.GECKOVIEW.value,
                     ],
@@ -376,7 +362,6 @@ class ClassificationProvider:
                     Suites.RAPTOR.value: [
                         Apps.FIREFOX.value,
                         Apps.CHROME.value,
-                        Apps.CHROMIUM.value,
                         Apps.FENIX.value,
                         Apps.GECKOVIEW.value,
                     ],
@@ -384,4 +369,25 @@ class ClassificationProvider:
                 "tasks": [],
                 "description": "A group of tests that monitor key graphics and media metrics to keep the browser fast",
             },
+            "Pageload Lite": {
+                "query": {
+                    Suites.RAPTOR.value: ["'browsertime 'tp6-bench"],
+                },
+                "suites": [Suites.RAPTOR.value],
+                "platform-restrictions": [
+                    Platforms.DESKTOP.value,
+                    Platforms.LINUX.value,
+                    Platforms.MACOSX.value,
+                    Platforms.WINDOWS.value,
+                ],
+                "variant-restrictions": {Suites.RAPTOR.value: [Variants.FISSION.value]},
+                "app-restrictions": {
+                    Suites.RAPTOR.value: [Apps.FIREFOX.value],
+                },
+                "tasks": [],
+                "description": (
+                    "Similar to the Pageload category, but it provides a minimum set "
+                    "of pageload tests to run for performance testing."
+                ),
+            },
         }
diff --git a/tools/tryselect/selectors/release.py b/tools/tryselect/selectors/release.py
index 994bbe644d..fae85469ba 100644
--- a/tools/tryselect/selectors/release.py
+++ b/tools/tryselect/selectors/release.py
@@ -94,6 +94,7 @@ def run(
         "browser/config/version.txt": "{}\n".format(app_version),
         "browser/config/version_display.txt": "{}\n".format(version),
         "config/milestone.txt": "{}\n".format(app_version),
+        "mobile/android/version.txt": "{}\n".format(version),
     }
     with open("browser/config/version.txt") as f:
         current_version = FirefoxVersion.parse(f.read())