aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Sapin <simon.sapin@exyr.org>2018-10-09 10:57:04 +0200
committerSimon Sapin <simon.sapin@exyr.org>2018-10-09 14:00:25 +0200
commit62e4f7072b6a2a9245324fead0c78f70c16234ae (patch)
tree7ee872a5f0d850a77f928f47315211f795224548
parent829b44e9f0a30bad4527544ba57bcbb7b7343ff9 (diff)
downloadservo-62e4f7072b6a2a9245324fead0c78f70c16234ae.tar.gz
servo-62e4f7072b6a2a9245324fead0c78f70c16234ae.zip
Taskcluster WPT: inline `extra` variable
-rw-r--r--etc/taskcluster/decision_task.py8
-rw-r--r--etc/taskcluster/windows/first-boot.ps12
2 files changed, 5 insertions, 5 deletions
diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py
index 2a2a2ea4505..dd637859eaa 100644
--- a/etc/taskcluster/decision_task.py
+++ b/etc/taskcluster/decision_task.py
@@ -131,7 +131,7 @@ def linux_wpt():
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))
+ wpt_chunk(release_build_task, total_chunks, this_chunk)
def linux_release_build():
@@ -150,7 +150,7 @@ def linux_release_build():
)
-def wpt_chunk(release_build_task, total_chunks, this_chunk, extra):
+def wpt_chunk(release_build_task, total_chunks, this_chunk):
name = "Linux x64: WPT chunk %s / %s" % (this_chunk, total_chunks)
script = """
./mach test-wpt \
@@ -171,7 +171,7 @@ def wpt_chunk(release_build_task, total_chunks, this_chunk, extra):
# IndexError: list index out of range
# File "/repo/python/servo/testing_commands.py", line 533, in filter_intermittents
# pull_request = int(last_merge.split(' ')[4][1:])
- if extra:
+ if this_chunk == 1:
name += " + extra"
script += """
./mach test-wpt-failure
@@ -295,4 +295,4 @@ CONFIG.repacked_msi_files_expire_in = build_dependencies_artifacts_expire_in
if __name__ == "__main__":
- main(task_for=os.environ["TASK_FOR"]) \ No newline at end of file
+ main(task_for=os.environ["TASK_FOR"])
diff --git a/etc/taskcluster/windows/first-boot.ps1 b/etc/taskcluster/windows/first-boot.ps1
index bbf1cdb6449..6c3106d7a0c 100644
--- a/etc/taskcluster/windows/first-boot.ps1
+++ b/etc/taskcluster/windows/first-boot.ps1
@@ -78,4 +78,4 @@ Start-Process C:\vs_buildtools.exe -ArgumentList (`
# Now shutdown, in preparation for creating an image
-shutdown -s \ No newline at end of file
+shutdown -s