Taskcluster: implement macOS WPT tasks

etc/taskcluster/decision_task.py

@@ -18,9 +18,12 @@ def main(task_for):
 
     if task_for == "github-push":
         # FIXME https://github.com/servo/servo/issues/22325 implement these:
-        macos_wpt = magicleap_dev = linux_arm32_dev = linux_arm64_dev = \
+        magicleap_dev = linux_arm32_dev = linux_arm64_dev = \
             android_arm32_dev_from_macos = lambda: None
 
+        # FIXME: not enabled yet
+        macos_wpt = lambda: None
+
         # FIXME https://github.com/servo/servo/issues/22187
         # In-emulator testing is disabled for now. (Instead we only compile.)
         # This local variable shadows the module-level function of the same name.
@@ -80,6 +83,7 @@ def main(task_for):
 def mocked_only():
     windows_release()
     linux_wpt()
+    macos_wpt()
     android_x86_wpt()
     decisionlib.DockerWorkerTask("Indexed by task definition").find_or_create()
 
@@ -172,6 +176,7 @@ def upload_docs():
         .create()
     )
 
+
 def macos_unit():
     return (
         macos_build_task("Dev build + unit tests")
@@ -299,21 +304,11 @@ def windows_release():
 
 
 def linux_wpt():
-    release_build_task = linux_release_build(with_debug_assertions=True)
+    release_build_task = (
-    total_chunks = 2
+        linux_build_task("Release build, with debug assertions")
-    for i in range(total_chunks):
+        .with_treeherder("Linux x64", "Release+A")
-        this_chunk = i + 1
-        wpt_chunk(release_build_task, total_chunks, this_chunk)
-
-
-def linux_release_build(with_debug_assertions=False):
-    a = with_debug_assertions
-    return (
-        linux_build_task("Release build" + ", with debug assertions" if a else "")
-        .with_treeherder("Linux x64", "Release" + "+A" if a else "")
-        .with_env(BUILD_FLAGS="--with-debug-assertions" if a else "")
         .with_script("""
-            ./mach build --release $BUILD_FLAGS -p servo
+            ./mach build --release --with-debug-assertions -p servo
             ./etc/ci/lockfile_changed.sh
             tar -czf /target.tar.gz \
                 target/release/servo \
@@ -321,68 +316,101 @@ def linux_release_build(with_debug_assertions=False):
                 target/release/build/osmesa-src-*/out/lib/gallium
         """)
         .with_artifacts("/target.tar.gz")
-        .find_or_create(
+        .find_or_create("build.linux_x64_release~assertions" + CONFIG.git_sha)
-            "build.linux_x64_release%s.%s" % ("_assertions" if a else "", CONFIG.git_sha)
-        )
     )
+    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)
 
 
-def wpt_chunk(release_build_task, total_chunks, this_chunk):
+def macos_wpt():
-    task = (
+    build_task = (
-        linux_task("WPT chunk %s / %s" % (this_chunk, total_chunks))
+        macos_build_task("Release build")
-        .with_treeherder("Linux x64", "WPT-%s" % this_chunk)
+        .with_treeherder("macOS x64", "Release")
-        .with_dockerfile(dockerfile_path("run"))
+        .with_script("""
-        .with_repo()
+            ./mach build --release
-        .with_curl_artifact_script(release_build_task, "target.tar.gz")
+            ./etc/ci/lockfile_changed.sh
-        .with_script("tar -xzf target.tar.gz")
+            tar -czf target.tar.gz \
-        .with_index_and_artifacts_expire_in(log_artifacts_expire_in)
+                target/release/servo \
-        .with_max_run_time_minutes(60)
+                target/release/build/osmesa-src-*/output \
-        .with_env(TOTAL_CHUNKS=total_chunks, THIS_CHUNK=this_chunk)
+                target/release/build/osmesa-src-*/out/src/gallium/targets/osmesa/.libs \
-    )
+                target/release/build/osmesa-src-*/out/src/mapi/shared-glapi/.libs
-    if this_chunk == 1:
-        task.name += " + extra"
-        task.extra["treeherder"]["symbol"] += "+"
-        task.with_script("""
-            ./mach test-wpt-failure
-            ./mach test-wpt --release --binary-arg=--multiprocess --processes 24 \
-                --log-raw test-wpt-mp.log \
-                --log-errorsummary wpt-mp-errorsummary.log \
-                eventsource \
-                | cat
-            time ./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 \
-                | cat
         """)
-    # `test-wpt` is piped into `cat` so that stdout is not a TTY
+        .with_artifacts("repo/target.tar.gz")
-    # and wptrunner does not use "interactive mode" formatting:
+        .find_or_create("build.macos_x64_release." + CONFIG.git_sha)
-    # https://github.com/servo/servo/issues/22438
+    )
-    task.with_script("""
+    def macos_run_task(name):
-        ./mach test-wpt \
+        return macos_task(name).with_python2()
-            --release \
+    wpt_chunks("macOS x64", macos_run_task, build_task, repo_dir="repo",
-            --processes 24 \
+               total_chunks=6, processes=4)
-            --total-chunks "$TOTAL_CHUNKS" \
+
-            --this-chunk "$THIS_CHUNK" \
+
-            --log-raw test-wpt.log \
+def wpt_chunks(platform, make_chunk_task, build_task, total_chunks, processes,
-            --log-errorsummary wpt-errorsummary.log \
+               repo_dir, chunks="all"):
-            --always-succeed \
+    if chunks == "all":
-            | cat
+        chunks = [n + 1 for n in range(total_chunks)]
-        ./mach filter-intermittents\
+    for this_chunk in chunks:
-            wpt-errorsummary.log \
+        task = (
-            --log-intermittents intermittents.log \
+            make_chunk_task("WPT chunk %s / %s" % (this_chunk, total_chunks))
-            --log-filteredsummary filtered-wpt-errorsummary.log \
+            .with_treeherder(platform, "WPT-%s" % this_chunk)
-            --tracker-api default \
+            .with_repo()
-            --reporter-api default
+            .with_curl_artifact_script(build_task, "target.tar.gz")
-    """)
+            .with_script("tar -xzf target.tar.gz")
-    task.with_artifacts(*[
+            .with_index_and_artifacts_expire_in(log_artifacts_expire_in)
-        "/repo/" + word
+            .with_max_run_time_minutes(60)
-        for script in task.scripts
+            .with_env(
-        for word in script.split()
+                TOTAL_CHUNKS=str(total_chunks),
-        if word.endswith(".log")
+                THIS_CHUNK=str(this_chunk),
-    ])
+                PROCESSES=str(processes),
-    return task.find_or_create("linux_wpt_%s.%s" % (this_chunk, CONFIG.git_sha))
+            )
+        )
+        if this_chunk == 1:
+            task.name += " + extra"
+            task.extra["treeherder"]["symbol"] += "+"
+            task.with_script("""
+                ./mach test-wpt-failure
+                time ./mach test-wpt --release --binary-arg=--multiprocess \
+                    --processes $PROCESSES \
+                    --log-raw test-wpt-mp.log \
+                    --log-errorsummary wpt-mp-errorsummary.log \
+                    eventsource \
+                    | cat
+                time ./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 \
+                    | cat
+            """)
+        # `test-wpt` is piped into `cat` so that stdout is not a TTY
+        # and wptrunner does not use "interactive mode" formatting:
+        # https://github.com/servo/servo/issues/22438
+        task.with_script("""
+            ./mach test-wpt \
+                --release \
+                --processes $PROCESSES \
+                --total-chunks "$TOTAL_CHUNKS" \
+                --this-chunk "$THIS_CHUNK" \
+                --log-raw test-wpt.log \
+                --log-errorsummary wpt-errorsummary.log \
+                --always-succeed \
+                | cat
+            ./mach filter-intermittents \
+                wpt-errorsummary.log \
+                --log-intermittents intermittents.log \
+                --log-filteredsummary filtered-wpt-errorsummary.log \
+                --tracker-api default \
+                --reporter-api default
+        """)
+        task.with_artifacts(*[
+            "%s/%s" % (repo_dir, word)
+            for script in task.scripts
+            for word in script.split()
+            if word.endswith(".log")
+        ])
+        platform_id = platform.replace(" ", "_").lower()
+        task.find_or_create("%s_wpt_%s.%s" % (platform_id, this_chunk, CONFIG.git_sha))
 
 
 def daily_tasks_setup():