Refactor

Author: jugglinmike

.taskcluster.yml

@@ -67,39 +67,52 @@ tasks:
                   - -c
                   - "~/provision.sh ${browser.name}-${browser.channel} ${event.repository.url} ${event.ref} ${event.after} &&
                     cd ~/web-platform-tests &&
-                    ./tools/ci/ci_taskcluster.sh ${browser.name} ${chunk[0]} ${chunk[1]} ${chunk[2]}"
+                    ./tools/ci/ci_taskcluster.sh ${browser.name} --test-type=${chunk[0]} --this-chunk=${chunk[1]} --total-chunks=${chunk[2]}"
     - $if: tasks_for == "github-pull-request"
       then:
         $map: [{name: firefox, channel: nightly}, {name: chrome, channel: dev}]
         each(browser):
-          taskId: {$eval: 'as_slugid(browser.name)'}
-          taskGroupId: {$eval: 'as_slugid("task group")'}
-          created: {$fromNow: ''}
-          deadline: {$fromNow: '24 hours'}
-          provisionerId: aws-provisioner-v1
-          # Contributors interested in configurating TaskCluster to run
-          # against their fork of WPT should change the `workerType` to
-          # "github-worker".
-          workerType: github-worker
-          metadata:
-            name: wpt-${browser.name}-${browser.channel}-stability
-            description: >-
-              Verify that tests modified in a pull request are stable when
-              executed in ${browser.name}.
-            owner: ${event.pull_request.user.login}@users.noreply.github.com
-            source: ${event.repository.url}
-          payload:
-            image: jugglinmike/web-platform-tests:0.17
-            maxRunTime: 7200
-            artifacts:
-              public/results:
-                path: /home/test/artifacts
-                type: directory
-            command:
-              - /bin/bash
-              - --login
-              - -c
-              - "set -e
-                ~/provision.sh ${browser.name}-${browser.channel} ${event.repository.url} refs/pull/${event.number}/head
-                cd ~/web-platform-tests
-                ./wpt check-stability ${browser.name} --metadata ~/meta/ --install-fonts"
+          $map:
+            - name: wpt-${browser.name}-${browser.channel}-stability
+              description: >-
+                Verify that tests modified in a pull request are stable when
+                executed in ${browser.name}.
+              command: >-
+                ./wpt tests-affected | \
+                  xargs ./tools/ci/ci_taskcluster.sh ${browser.name} --verify
+            - name: wpt-${browser.name}-${browser.channel}-results
+              description: >-
+                Collect results for modified tests in ${browser.name}.
+              command: >-
+                ./wpt tests-affected | \
+                  xargs ./tools/ci/ci_taskcluster.sh ${browser.name}
+          each(operation):
+            taskId: {$eval: 'as_slugid(browser.name)'}
+            taskGroupId: {$eval: 'as_slugid("task group")'}
+            created: {$fromNow: ''}
+            deadline: {$fromNow: '24 hours'}
+            provisionerId: aws-provisioner-v1
+            # Contributors interested in configurating TaskCluster to run
+            # against their fork of WPT should change the `workerType` to
+            # "github-worker".
+            workerType: github-worker
+            metadata:
+              name: ${operation.name}
+              description: ${operation.description}
+              owner: ${event.pull_request.user.login}@users.noreply.github.com
+              source: ${event.repository.url}
+            payload:
+              image: jugglinmike/web-platform-tests:0.17
+              maxRunTime: 7200
+              artifacts:
+                public/results:
+                  path: /home/test/artifacts
+                  type: directory
+              command:
+                - /bin/bash
+                - --login
+                - -c
+                - "set -e
+                  ~/provision.sh ${browser.name}-${browser.channel} ${event.repository.url} refs/pull/${event.number}/head
+                  cd ~/web-platform-tests
+                  ${operation.command}"

tools/ci/ci_taskcluster.sh

@@ -2,9 +2,24 @@
 
 ./wpt manifest-download
 
-if [ $1 == "firefox" ]; then
-    ./wpt run firefox --log-tbpl=../artifacts/log_tbpl.log --log-tbpl-level=info --log-wptreport=../artifacts/wpt_report.json --log-mach=- --this-chunk=$3 --total-chunks=$4 --test-type=$2 -y --install-browser --no-pause --no-restart-on-unexpected --reftest-internal --install-fonts --no-fail-on-unexpected
-elif [ $1 == "chrome" ]; then
-    ./wpt run chrome --log-tbpl=../artifacts/log_tbpl.log --log-tbpl-level=info --log-wptreport=../artifacts/wpt_report.json --log-mach=- --this-chunk=$3 --total-chunks=$4 --test-type=$2 -y  --no-pause --no-restart-on-unexpected --install-fonts --no-fail-on-unexpected
+browser_specific_args=''
+
+if [ $1 == 'firefox' ]; then
+  browser_specific_args='--install-browser --reftest-internal'
 fi
+
+./wpt run \
+  $@ \
+  $browser_specific_args \
+  --log-tbpl=../artifacts/log_tbpl.log \
+  --log-tbpl-level=info \
+  --log-wptreport=../artifacts/wpt_report.json \
+  --log-mach=- \
+  --this-chunk=$3 --total-chunks=$4 --test-type=$2 \
+  -y \
+  --no-pause \
+  --no-restart-on-unexpected \
+  --install-fonts \
+  --no-fail-on-unexpected
+
 gzip ../artifacts/wpt_report.json