Merging upstream version 127.0.

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

2 files changed, 37 insertions, 38 deletions

diff --git a/testing/web-platform/tests/tools/ci/tc/tasks/test.yml b/testing/web-platform/tests/tools/ci/tc/tasks/test.yml
index c172e6b731..a9ca07c6ce 100644
--- a/testing/web-platform/tests/tools/ci/tc/tasks/test.yml
+++ b/testing/web-platform/tests/tools/ci/tc/tasks/test.yml
@@ -115,25 +115,24 @@ components:
     chunks-override:
       testharness: 24
 
-  tox-python3_7:
+  tox-python3_8:
     env:
-      TOXENV: py37
+      TOXENV: py38
       PY_COLORS: "0"
     install:
-      - python3.7
-      - python3.7-distutils
-      - python3.7-dev
-      - python3.7-venv
+      - python3.8
+      - python3.8-distutils
+      - python3.8-dev
+      - python3.8-venv
 
-  tox-python3_11:
+  tox-python3_12:
     env:
-      TOXENV: py311
+      TOXENV: py312
       PY_COLORS: "0"
     install:
-      - python3.11
-      - python3.11-distutils
-      - python3.11-dev
-      - python3.11-venv
+      - python3.12
+      - python3.12-dev
+      - python3.12-venv
   tests-affected:
     options:
       browser:
@@ -438,13 +437,13 @@ tasks:
           - update_built
       command: "./tools/ci/ci_built_diff.sh"
 
-  - tools/ unittests (Python 3.7):
+  - tools/ unittests (Python 3.8):
       description: >-
-        Unit tests for tools running under Python 3.7, excluding wptrunner
+        Unit tests for tools running under Python 3.8, excluding wptrunner
       use:
         - wpt-base
         - trigger-pr
-        - tox-python3_7
+        - tox-python3_8
       command: ./tools/ci/ci_tools_unittest.sh
       env:
         HYPOTHESIS_PROFILE: ci
@@ -452,13 +451,13 @@ tasks:
         run-job:
           - tools_unittest
 
-  - tools/ unittests (Python 3.11):
+  - tools/ unittests (Python 3.12):
       description: >-
-        Unit tests for tools running under Python 3.11, excluding wptrunner
+        Unit tests for tools running under Python 3.12, excluding wptrunner
       use:
         - wpt-base
         - trigger-pr
-        - tox-python3_11
+        - tox-python3_12
       command: ./tools/ci/ci_tools_unittest.sh
       env:
         HYPOTHESIS_PROFILE: ci
@@ -466,13 +465,13 @@ tasks:
         run-job:
           - tools_unittest
 
-  - tools/ integration tests (Python 3.7):
+  - tools/ integration tests (Python 3.8):
       description: >-
-        Integration tests for tools running under Python 3.7
+        Integration tests for tools running under Python 3.8
       use:
         - wpt-base
         - trigger-pr
-        - tox-python3_7
+        - tox-python3_8
       command: ./tools/ci/ci_tools_integration_test.sh
       install:
         - libnss3-tools
@@ -488,13 +487,13 @@ tasks:
         run-job:
           - wpt_integration
 
-  - tools/ integration tests (Python 3.11):
+  - tools/ integration tests (Python 3.12):
       description: >-
-        Integration tests for tools running under Python 3.11
+        Integration tests for tools running under Python 3.12
       use:
         - wpt-base
         - trigger-pr
-        - tox-python3_11
+        - tox-python3_12
       command: ./tools/ci/ci_tools_integration_test.sh
       install:
         - libnss3-tools
@@ -510,13 +509,13 @@ tasks:
         run-job:
           - wpt_integration
 
-  - resources/ tests (Python 3.7):
+  - resources/ tests (Python 3.8):
       description: >-
-        Tests for testharness.js and other files in resources/ under Python 3.7
+        Tests for testharness.js and other files in resources/ under Python 3.8
       use:
         - wpt-base
         - trigger-pr
-        - tox-python3_7
+        - tox-python3_8
       command: ./tools/ci/ci_resources_unittest.sh
       install:
         - libnss3-tools
@@ -529,13 +528,13 @@ tasks:
         run-job:
           - resources_unittest
 
-  - resources/ tests (Python 3.11):
+  - resources/ tests (Python 3.12):
       description: >-
-        Tests for testharness.js and other files in resources/ under Python 3.11
+        Tests for testharness.js and other files in resources/ under Python 3.12
       use:
         - wpt-base
         - trigger-pr
-        - tox-python3_11
+        - tox-python3_12
       command: ./tools/ci/ci_resources_unittest.sh
       install:
         - libnss3-tools
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
index 62bb09a1c3..dd8d732654 100644
--- a/testing/web-platform/tests/tools/ci/tc/tests/test_valid.py
+++ b/testing/web-platform/tests/tools/ci/tc/tests/test_valid.py
@@ -202,12 +202,12 @@ def test_verify_payload():
       'lint']),
     ("pr_event.json", True, {".taskcluster.yml", ".travis.yml", "tools/ci/start.sh"},
      ['lint',
-      'tools/ unittests (Python 3.7)',
-      'tools/ unittests (Python 3.11)',
-      'tools/ integration tests (Python 3.7)',
-      'tools/ integration tests (Python 3.11)',
-      'resources/ tests (Python 3.7)',
-      'resources/ tests (Python 3.11)',
+      'tools/ unittests (Python 3.8)',
+      'tools/ unittests (Python 3.12)',
+      'tools/ integration tests (Python 3.8)',
+      'tools/ integration tests (Python 3.12)',
+      'resources/ tests (Python 3.8)',
+      'resources/ tests (Python 3.12)',
       'download-firefox-nightly',
       'infrastructure/ tests',
       'sink-task']),
@@ -224,8 +224,8 @@ def test_verify_payload():
       'sink-task']),
     ("pr_event_tests_affected.json", True, {"resources/testharness.js"},
      ['lint',
-      'resources/ tests (Python 3.7)',
-      'resources/ tests (Python 3.11)',
+      'resources/ tests (Python 3.8)',
+      'resources/ tests (Python 3.12)',
       'download-firefox-nightly',
       'infrastructure/ tests',
       'sink-task']),