Auto merge of #24785 - servo:linux-wpt2, r=jdm

Move WPT Linux from Buildbot to Taskcluster Closes https://github.com/servo/servo/pull/24418
2025-08-06 06:00:15 +01:00 · 2019-11-19 22:53:33 -05:00 · 2019-11-19 22:53:33 -05:00 · 6d4a09ebd9
commit 6d4a09ebd9
parent e07f0280fe 34287e5342
8 changed files with 22 additions and 63 deletions
--- a/etc/ci/buildbot_steps.yml
+++ b/etc/ci/buildbot_steps.yml
@ -18,45 +18,6 @@ linux-rel-nogate:
  - env RUSTFLAGS= bash ./etc/ci/mutation_test.sh
  - ./etc/ci/clean_build_artifacts.sh

-linux-rel-wpt:
-  env:
-    CCACHE: sccache
-    RUSTC_WRAPPER: sccache
-    CC: clang-4.0
-    CXX: clang++-4.0
-  commands:
-    - ./mach clean-nightlies --keep 3 --force
-    - ./mach clean-cargo-cache --keep 3 --force
-    - ./etc/ci/clean_build_artifacts.sh
-    - ./mach build --release --with-debug-assertions -p servo
-    - ./mach test-wpt-failure
-    - ./mach test-wpt --release --processes 24 --total-chunks 2 --this-chunk 1 --log-raw test-wpt.log --log-errorsummary wpt-errorsummary.log --always-succeed
-    - ./mach filter-intermittents wpt-errorsummary.log --log-intermittents intermittents.log --log-filteredsummary filtered-wpt-errorsummary.log --tracker-api default --reporter-api default
-    - ./mach test-wpt --release --binary-arg=--multiprocess --processes 24 --log-raw test-wpt-mp.log --log-errorsummary wpt-mp-errorsummary.log eventsource
-    - ./mach test-wpt --release --product=servodriver --headless tests/wpt/mozilla/tests/mozilla/DOMParser.html tests/wpt/mozilla/tests/css/per_glyph_font_fallback_a.html tests/wpt/mozilla/tests/css/img_simple.html tests/wpt/mozilla/tests/mozilla/secure.https.html
-    - ./mach test-wpt --release --product=servodriver --headless --log-raw test-bluetooth.log --log-errorsummary bluetooth-errorsummary.log bluetooth
-    - ./mach test-wpt --release --headless --timeout-multiplier=4 --log-raw test-wdspec.log --log-errorsummary wdspec-errorsummary.log --always-succeed webdriver
-    - ./mach filter-intermittents wdspec-errorsummary.log --log-intermittents intermittents.log --log-filteredsummary filtered-wdspec-errorsummary.log --tracker-api default --reporter-api default
-    - ./etc/ci/clean_build_artifacts.sh
-
-linux-rel-css:
-  env:
-    CCACHE: sccache
-    RUSTC_WRAPPER: sccache
-    CC: clang-4.0
-    CXX: clang++-4.0
-  commands:
-    - ./mach clean-nightlies --keep 3 --force
-    - ./mach clean-cargo-cache --keep 3 --force
-    - ./etc/ci/clean_build_artifacts.sh
-    - ./mach build --release --with-debug-assertions -p servo
-    - ./mach test-wpt --release --processes 24 --total-chunks 2 --this-chunk 2 --log-raw test-wpt.log --log-errorsummary wpt-errorsummary.log --always-succeed
-    - ./mach filter-intermittents wpt-errorsummary.log --log-intermittents intermittents.log --log-filteredsummary filtered-wpt-errorsummary.log --tracker-api default --reporter-api default
-    - env SERVO_WEBGL_MAIN_THREAD=1 ./mach test-wpt --release --processes 24 --log-raw test-wpt-webgl.log --log-errorsummary webgl-errorsummary.log --always-succeed tests/wpt/webgl/tests/conformance
-    - ./mach filter-intermittents webgl-errorsummary.log --log-intermittents webgl-intermittents.log --log-filteredsummary filtered-webgl-errorsummary.log --tracker-api default --reporter-api default
-    - bash ./etc/ci/lockfile_changed.sh
-    - ./etc/ci/clean_build_artifacts.sh
-
 # Moved to Taskcluster
 linux-dev: []
 mac-dev-unit: []
@ -76,6 +37,8 @@ mac-nightly: []
 magicleap-nightly: []
 magicleap: []
 linux-nightly: []
+linux-rel-wpt: []
+linux-rel-css: []

 # No longer maintained
 arm32: []
--- a/etc/taskcluster/decision_task.py
+++ b/etc/taskcluster/decision_task.py
@ -16,9 +16,6 @@ def main(task_for):
            branch if not branch.startswith("try-") else "try"
        )

-
-    # Implemented but disabled for now:
-    linux_wpt = lambda: None  # Shadows the existing top-level function
    # The magicleap build is broken until there's a surfman back end
    magicleap_dev = lambda: None
    magicleap_nightly = lambda: None
@ -110,7 +107,6 @@ def main(task_for):
 def mocked_only():
    windows_release()
    android_x86_wpt()
-    linux_wpt()
    magicleap_dev()
    magicleap_nightly()
    decisionlib.DockerWorkerTask("Indexed by task definition").find_or_create()
@ -551,12 +547,12 @@ def linux_wpt():
                target/release/build/osmesa-src-*/out/lib/gallium
        """)
        .with_artifacts("/target.tar.gz")
-        .find_or_create("build.linux_x64_release~assertions" + CONFIG.task_id())
+        .find_or_create("build.linux_x64_release_w_assertions" + CONFIG.task_id())
    )
    def linux_run_task(name):
        return linux_task(name).with_dockerfile(dockerfile_path("run"))
    wpt_chunks("Linux x64", linux_run_task, release_build_task, repo_dir="/repo",
-               total_chunks=2, processes=24)
+               total_chunks=4, processes=12)


 def macos_nightly():
@ -610,8 +606,8 @@ def update_wpt():

 def macos_release_build_with_debug_assertions(priority=None):
    return (
-        macos_build_task("Release build")
-        .with_treeherder("macOS x64", "Release")
+        macos_build_task("Release build, with debug assertions")
+        .with_treeherder("macOS x64", "Release+A")
        .with_priority(priority)
        .with_script("\n".join([
            "./mach build --release --verbose --with-debug-assertions",
--- a/etc/taskcluster/docker/base.dockerfile
+++ b/etc/taskcluster/docker/base.dockerfile
@ -19,8 +19,12 @@ RUN \
        python-pip \
        python-dev \
        #
+        # Compiling C modules when installing Python packages in a virtualenv
+        gcc \
+        #
        # Installing rustup and sccache (build dockerfile) or fetching build artifacts (run tasks)
-        curl && \
+        curl \
+    && \
    # Running mach
    pip install virtualenv

--- a/etc/taskcluster/docker/run.dockerfile
+++ b/etc/taskcluster/docker/run.dockerfile
@ -1,10 +1,15 @@
 % include base.dockerfile

-# Servo’s runtime dependencies
+# Servo’s runtime dependencies:
 RUN apt-get install -qy --no-install-recommends \
    libgl1 \
    libssl1.1 \
    libdbus-1-3 \
-    libgstreamer-plugins-bad1.0-0 \
-    gstreamer1.0-plugins-good
-
+    gstreamer1.0-plugins-good \
+    gstreamer1.0-plugins-bad \
+    gstreamer1.0-libav \
+    gstreamer1.0-gl \
+    libunwind8 \
+    #
+    # Compiling shaders in OSMesa:
+    llvm \
--- a/tests/wpt/metadata/css/css-text/word-break/word-break-break-all-005.html.ini
+++ b/tests/wpt/metadata/css/css-text/word-break/word-break-break-all-005.html.ini
@ -1,4 +0,0 @@
-[word-break-break-all-005.html]
-  type: reftest
-  expected:
-    if os == "linux": FAIL
--- a/tests/wpt/metadata/webdriver/tests/element_send_keys/file_upload.py.ini
+++ b/tests/wpt/metadata/webdriver/tests/element_send_keys/file_upload.py.ini
@ -1,4 +1,6 @@
 [file_upload.py]
+  expected:
+    if os == "linux": TIMEOUT
  [test_multiple_files]
    expected: FAIL

--- a/tests/wpt/mozilla/meta/css/text_decoration_underline_subpx_a.html.ini
+++ b/tests/wpt/mozilla/meta/css/text_decoration_underline_subpx_a.html.ini
@ -1,4 +0,0 @@
-[text_decoration_underline_subpx_a.html]
-  bug: https://github.com/servo/servo/issues/23569
-  expected:
-    if os == "linux": FAIL
--- a/tests/wpt/mozilla/meta/mozilla/fetch_cannot_overwhelm_system.window.js.ini
+++ b/tests/wpt/mozilla/meta/mozilla/fetch_cannot_overwhelm_system.window.js.ini
@ -1,3 +0,0 @@
-[fetch_cannot_overwhelm_system.window.html]
-  expected:
-      if os == "linux": CRASH