tor-browser

commit d413d643c5437cf58c3dde78e5a6361e564e055d
parent 1a005d64bd5394d1d7d4aa604ccccd8199789d3b
Author: Sam Sneddon <gsnedders@apple.com>
Date:   Fri, 10 Oct 2025 07:50:01 +0000

Bug 1992908 [wpt PR 55275] - TC: run infrastructure/ separately per browser, a=testonly

Automatic update from web-platform-tests
TC: run infrastructure/ separately per browser

This is semi-frequently our slowest CI job, and having them in a
single task also leads to us failing overly eagerly (#53334).

--

wpt-commits: 644c18e7586056459817f1756d1aacea77043a48
wpt-pr: 55275

Diffstat:
M
testing/web-platform/tests/tools/ci/ci_wptrunner_infrastructure.sh
 | 
7
++++---
M
testing/web-platform/tests/tools/ci/tc/tasks/test.yml
 | 
63
+++++++++++++++++++++++++++++++++++----------------------------
M
testing/web-platform/tests/tools/ci/tc/tests/test_valid.py
 | 
8
++++++--

3 files changed, 45 insertions(+), 33 deletions(-)
diff --git a/testing/web-platform/tests/tools/ci/ci_wptrunner_infrastructure.sh b/testing/web-platform/tests/tools/ci/ci_wptrunner_infrastructure.sh
@@ -6,15 +6,16 @@ SCRIPT_DIR=$(cd "$REL_DIR_NAME" && pwd -P)
 WPT_ROOT=$SCRIPT_DIR/../..
 cd "$WPT_ROOT"
 
+BROWSER="$1"
+CHANNEL="$2"
+
 run_infra_test() {
     echo "### Running Infrastructure Tests for $1 ###"
     ./tools/ci/taskcluster-run.py "$1" "$2" -- --log-tbpl=- --log-wptreport="../artifacts/wptreport-$1.json" --logcat-dir="../artifacts/" --metadata=infrastructure/metadata/ --include=infrastructure/
 }
 
 main() {
-  run_infra_test "chrome" "dev"
-  run_infra_test "firefox" "nightly"
-  run_infra_test "firefox_android" "nightly"
+  run_infra_test "$BROWSER" "$CHANNEL"
 }
 
 main
diff --git a/testing/web-platform/tests/tools/ci/tc/tasks/test.yml b/testing/web-platform/tests/tools/ci/tc/tasks/test.yml
@@ -573,34 +573,41 @@ tasks:
         run-job:
           - resources_unittest
 
-  - infrastructure/ tests:
-      description: >-
-        Smoketests for wptrunner
-      vars:
-        channel: nightly
-      use:
-        - wpt-base
-        - trigger-pr
-        - browser-firefox
-        - browser-firefox_android
-      command: ./tools/ci/ci_wptrunner_infrastructure.sh
-      install:
-        - python3-pip
-        - libnss3-tools
-        - libappindicator1
-        - fonts-liberation
-      options:
-        oom-killer: true
-        browser:
-          - firefox
-          - chrome
-          - firefox_android
-        channel: experimental
-        xvfb: true
-        hosts: false
-      schedule-if:
-        run-job:
-          - wptrunner_infrastructure
+  - $map:
+      for:
+        - vars:
+            browser: firefox
+            channel: nightly
+        - vars:
+            browser: chrome
+            channel: dev
+        - vars:
+            browser: firefox_android
+            channel: nightly
+      do:
+        - infrastructure/ tests (${vars.browser}):
+            description: >-
+              Smoketests for wptrunner in ${vars.browser}.
+            use:
+              - wpt-base
+              - trigger-pr
+              - browser-${vars.browser}
+            command: ./tools/ci/ci_wptrunner_infrastructure.sh ${vars.browser} ${vars.channel}
+            install:
+              - python3-pip
+              - libnss3-tools
+              - libappindicator1
+              - fonts-liberation
+            options:
+              oom-killer: true
+              browser:
+                - ${vars.browser}
+              channel: ${vars.channel}
+              xvfb: true
+              hosts: false
+            schedule-if:
+              run-job:
+                - wptrunner_infrastructure
 
   # Note: even though sink-task does not have `depends-on`, it depends on all
   # other tasks (dynamically added by tools/ci/tc/decision.py).
diff --git a/testing/web-platform/tests/tools/ci/tc/tests/test_valid.py b/testing/web-platform/tests/tools/ci/tc/tests/test_valid.py
@@ -183,7 +183,9 @@ def test_verify_payload():
       'resources/ tests (Python 3.8)',
       'resources/ tests (Python 3.13)',
       'download-firefox-nightly',
-      'infrastructure/ tests',
+      'infrastructure/ tests (firefox)',
+      'infrastructure/ tests (chrome)',
+      'infrastructure/ tests (firefox_android)',
       'sink-task']),
     # More tests are affected in the actual PR but it shouldn't affect the scheduled tasks
     ("pr_event_tests_affected.json", True, {"layout-instability/clip-negative-bottom-margin.html",
@@ -201,7 +203,9 @@ def test_verify_payload():
       'resources/ tests (Python 3.8)',
       'resources/ tests (Python 3.13)',
       'download-firefox-nightly',
-      'infrastructure/ tests',
+      'infrastructure/ tests (firefox)',
+      'infrastructure/ tests (chrome)',
+      'infrastructure/ tests (firefox_android)',
       'sink-task']),
     ("epochs_daily_push_event.json", False, None,
      ['download-firefox-stable',