From e60e534d23209c944b48596d437a9a9c09f20542 Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Tue, 11 Dec 2018 19:11:03 +0100
Subject: [PATCH] Move linux WPT from Buildbot to Taskcluster

---
 etc/ci/buildbot_steps.yml        | 36 ++------------------------------
 etc/taskcluster/decision_task.py |  3 ---
 2 files changed, 2 insertions(+), 37 deletions(-)

diff --git a/etc/ci/buildbot_steps.yml b/etc/ci/buildbot_steps.yml
index 113bd05b693..19cf92fabf0 100644
--- a/etc/ci/buildbot_steps.yml
+++ b/etc/ci/buildbot_steps.yml
@@ -96,40 +96,6 @@ mac-rel-intermittent:
   - env PKG_CONFIG_PATH=/usr/local/opt/zlib/lib/pkgconfig ./mach build --release
   - ./etc/ci/check_intermittents.sh --log-raw intermittents.log
 
-linux-rel-wpt:
-  env:
-    CCACHE: sccache
-    RUSTC_WRAPPER: sccache
-    CC: gcc-5
-    CXX: g++-5
-  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
-    - ./etc/ci/clean_build_artifacts.sh
-
-linux-rel-css:
-  env:
-    CCACHE: sccache
-    RUSTC_WRAPPER: sccache
-    CC: gcc-5
-    CXX: g++-5
-  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
-    - bash ./etc/ci/lockfile_changed.sh
-    - ./etc/ci/clean_build_artifacts.sh
-
 linux-nightly:
  env:
   CC: gcc-5
@@ -277,3 +243,5 @@ mac-dev-unit: []
 windows-msvc-dev: []
 android: []
 android-x86: []
+linux-rel-wpt: []
+linux-rel-css: []
diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py
index 70036107a9f..d27a7111fc9 100644
--- a/etc/taskcluster/decision_task.py
+++ b/etc/taskcluster/decision_task.py
@@ -14,9 +14,6 @@ def main(task_for):
         macos_wpt = magicleap_dev = linux_arm32_dev = linux_arm64_dev = \
             android_arm32_dev_from_macos = lambda: None
 
-        # Implemented but disabled for now:
-        linux_wpt = lambda: None  # Shadows the existing top-level function
-
         all_tests = [
             linux_tidy_unit_docs,
             windows_unit,