Split decision task code into more functions

etc/ci/taskcluster/decision-task.py

@@ -10,25 +10,13 @@ from decisionlib import DecisionTask
 
 
 def main():
-    decision = DecisionTask(
-        project_name="Servo",  # Used in task names
-        route_prefix="project.servo.servo",
-        worker_type="servo-docker-worker",
-    )
+    linux_tidy_unit()
+    linux_wpt()
+
 
 build_artifacts_expiry = "1 week"
 log_artifacts_expiry = "1 year"
 
-    # https://docs.taskcluster.net/docs/reference/workers/docker-worker/docs/caches
-    cache_scopes = [
-        "docker-worker:cache:cargo-*",
-    ]
-    build_caches = {
-        "cargo-registry-cache": "/root/.cargo/registry",
-        "cargo-git-cache": "/root/.cargo/git",
-        "cargo-rustup": "/root/.rustup",
-        "cargo-sccache": "/root/.cache/sccache",
-    }
 build_env = {
     "RUST_BACKTRACE": "1",
     "RUSTFLAGS": "-Dwarnings",
@@ -37,15 +25,10 @@ def main():
     "CCACHE": "sccache",
     "RUSTC_WRAPPER": "sccache",
 }
-    build_kwargs = {
-        "max_run_time_minutes": 60,
-        "dockerfile": dockerfile_path("build"),
-        "env": build_env,
-        "scopes": cache_scopes,
-        "cache": build_caches,
-    }
 
-    decision.create_task(
+
+def linux_tidy_unit():
+    return decision.create_task(
         task_name="Linux x86_64: tidy + dev build + unit tests",
         script="""
             ./mach test-tidy --no-progress --all
@@ -60,9 +43,19 @@ def main():
         **build_kwargs
     )
 
-    release_build_task = decision.find_or_create_task(
+
+def linux_wpt():
+    release_build_task = linux_release_build()
+    total_chunks = 2
+    for i in range(total_chunks):
+        this_chunk = i + 1
+        wpt_chunk(release_build_task, total_chunks, this_chunk, extra=(this_chunk == 1))
+
+
+def linux_release_build():
+    return decision.find_or_create_task(
         route_bucket="build.linux_x86-64_release",
-        route_key=os.environ["GIT_SHA"],
+        route_key=os.environ["GIT_SHA"],  # Set in .taskcluster.yml
         route_expiry=build_artifacts_expiry,
 
         task_name="Linux x86_64: release build",
@@ -80,27 +73,9 @@ def main():
         **build_kwargs
     )
 
-    def create_run_task(*, script, env=None, **kwargs):
-        fetch_build = """
-            ./etc/ci/taskcluster/curl-artifact.sh ${BUILD_TASK_ID} target.tar.gz | tar -xz
-        """
-        kwargs.setdefault("artifacts", []).extend(
-            ("/repo/" + word, log_artifacts_expiry)
-            for word in script.split() if word.endswith(".log")
-        )
-        decision.create_task(
-            script=fetch_build + script,
-            env=dict(**env or {}, BUILD_TASK_ID=release_build_task),
-            dependencies=[release_build_task],
-            max_run_time_minutes=60,
-            dockerfile=dockerfile_path("run"),
-            **kwargs
-        )
 
-    total_chunks = 2
-    for i in range(total_chunks):
-        chunk = i + 1
-        if chunk == 1:
+def wpt_chunk(release_build_task, total_chunks, this_chunk, extra):
+    if extra:
         name_extra = " + extra"
         script_extra = """
             ./mach test-wpt-failure
@@ -132,18 +107,62 @@ def main():
     # File "/repo/python/servo/testing_commands.py", line 533, in filter_intermittents
     #   pull_request = int(last_merge.split(' ')[4][1:])
     create_run_task(
-            task_name="Linux x86_64: WPT chunk %s / %s%s" % (chunk, total_chunks, name_extra),
+        build_task=release_build_task,
+        task_name="Linux x86_64: WPT chunk %s / %s%s" % (this_chunk, total_chunks, name_extra),
         script=script_extra + script,
         env={
             "TOTAL_CHUNKS": total_chunks,
-                "THIS_CHUNK": chunk,
+            "THIS_CHUNK": this_chunk,
         },
     )
 
 
+def create_run_task(*, build_task, script, **kwargs):
+    fetch_build = """
+        ./etc/ci/taskcluster/curl-artifact.sh ${BUILD_TASK_ID} target.tar.gz | tar -xz
+    """
+    kwargs.setdefault("env", {})["BUILD_TASK_ID"] = build_task
+    kwargs.setdefault("dependencies", []).append(build_task)
+    kwargs.setdefault("artifacts", []).extend(
+        ("/repo/" + word, log_artifacts_expiry)
+        for word in script.split() if word.endswith(".log")
+    )
+    return decision.create_task(
+        script=fetch_build + script,
+        max_run_time_minutes=60,
+        dockerfile=dockerfile_path("run"),
+        **kwargs
+    )
+
+
 def dockerfile_path(name):
     return os.path.join(os.path.dirname(__file__), "docker", name + ".dockerfile")
 
 
+decision = DecisionTask(
+    project_name="Servo",  # Used in task names
+    route_prefix="project.servo.servo",
+    worker_type="servo-docker-worker",
+)
+
+# https://docs.taskcluster.net/docs/reference/workers/docker-worker/docs/caches
+cache_scopes = [
+    "docker-worker:cache:cargo-*",
+]
+build_caches = {
+    "cargo-registry-cache": "/root/.cargo/registry",
+    "cargo-git-cache": "/root/.cargo/git",
+    "cargo-rustup": "/root/.rustup",
+    "cargo-sccache": "/root/.cache/sccache",
+}
+build_kwargs = {
+    "max_run_time_minutes": 60,
+    "dockerfile": dockerfile_path("build"),
+    "env": build_env,
+    "scopes": cache_scopes,
+    "cache": build_caches,
+}
+
+
 if __name__ == "__main__":
     main()