Merge pull request #12679 from web-platform-tests/tc_epoch

Run stable and beta releases on TaskCluster
web-platform-tests · Sep 6, 2018 · 32fc9a3 · 32fc9a3
2 parents 72ae98c + d7627ae
commit 32fc9a3
Show file tree

Hide file tree

Showing 11 changed files with 322 additions and 143 deletions.
diff --git a/.taskcluster.yml b/.taskcluster.yml
@@ -4,71 +4,76 @@ policy:
 tasks:
   $if: tasks_for == "github-push"
   then:
-    $if: event.ref == "refs/heads/master"
-    then:
-      $flattenDeep:
-        $map: [{name: firefox, channel: nightly}, {name: chrome, channel: dev}]
-        each(browser):
-          $map:
-            - [testharness, 1, 15]
-            - [testharness, 2, 15]
-            - [testharness, 3, 15]
-            - [testharness, 4, 15]
-            - [testharness, 5, 15]
-            - [testharness, 6, 15]
-            - [testharness, 7, 15]
-            - [testharness, 8, 15]
-            - [testharness, 9, 15]
-            - [testharness, 10, 15]
-            - [testharness, 11, 15]
-            - [testharness, 12, 15]
-            - [testharness, 13, 15]
-            - [testharness, 14, 15]
-            - [testharness, 15, 15]
-            - [reftest, 1, 10]
-            - [reftest, 2, 10]
-            - [reftest, 3, 10]
-            - [reftest, 4, 10]
-            - [reftest, 5, 10]
-            - [reftest, 6, 10]
-            - [reftest, 7, 10]
-            - [reftest, 8, 10]
-            - [reftest, 9, 10]
-            - [reftest, 10, 10]
-            - [wdspec, 1, 1]
-          each(chunk):
-            taskId: {$eval: 'as_slugid(browser.name + browser.channel + chunk[0] + str(chunk[1]))'}
-            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: wpt-docker-worker
-            metadata:
-              name: wpt-${browser.name}-${browser.channel}-${chunk[0]}-${chunk[1]}
-              description: >-
-                A subset of WPT's "${chunk[0]}" tests (chunk number ${chunk[1]}
-                of ${chunk[2]}), run in the ${browser.channel} release of
-                ${browser.name}.
-              owner: ${event.pusher.email}
-              source: ${event.repository.url}
-            payload:
-              image: gsnedders/web-platform-tests:0.13
-              maxRunTime: 7200
-              artifacts:
-                public/results:
-                  path: /home/test/artifacts
-                  type: directory
-              command:
-                - /bin/bash
-                - --login
-                - -c
-                - "~/start.sh ${event.repository.url} ${event.ref[len('refs/heads/'):]} ${event.after} ${browser.name}-${browser.channel} &&
-                  cd ~/web-platform-tests &&
-                  ./tools/ci/ci_taskcluster.sh ${browser.name} ${chunk[0]} ${chunk[1]} ${chunk[2]}"
-    else: []
+    $flattenDeep:
+      $map:
+        $flatten:
+          $match: {
+            event.ref == "refs/heads/master": [{name: firefox, channel: nightly}, {name: chrome, channel: dev}],
+            event.ref == "refs/heads/epochs/daily": [{name: firefox, channel: beta}, {name: chrome, channel: beta}],
+            event.ref == "refs/heads/epochs/weekly": [{name: firefox, channel: stable}, {name: chrome, channel: stable}]
+            }
+      each(browser):
+        $map:
+          - [testharness, 1, 15]
+          - [testharness, 2, 15]
+          - [testharness, 3, 15]
+          - [testharness, 4, 15]
+          - [testharness, 5, 15]
+          - [testharness, 6, 15]
+          - [testharness, 7, 15]
+          - [testharness, 8, 15]
+          - [testharness, 9, 15]
+          - [testharness, 10, 15]
+          - [testharness, 11, 15]
+          - [testharness, 12, 15]
+          - [testharness, 13, 15]
+          - [testharness, 14, 15]
+          - [testharness, 15, 15]
+          - [reftest, 1, 10]
+          - [reftest, 2, 10]
+          - [reftest, 3, 10]
+          - [reftest, 4, 10]
+          - [reftest, 5, 10]
+          - [reftest, 6, 10]
+          - [reftest, 7, 10]
+          - [reftest, 8, 10]
+          - [reftest, 9, 10]
+          - [reftest, 10, 10]
+          - [wdspec, 1, 1]
+        each(chunk):
+          taskId: {$eval: 'as_slugid(browser.name + browser.channel + chunk[0] + str(chunk[1]))'}
+          taskGroupId: {$eval: 'as_slugid("task group")'}
+          created: {$fromNow: ''}
+          deadline: {$fromNow: '24 hours'}
+          provisionerId: aws-provisioner-v1
+          workerType:
+            $if: event.repository.full_name == 'web-platform-tests/wpt'
+            then:
+              wpt-docker-worker
+            else:
+              github-worker
+          metadata:
+            name: wpt-${browser.name}-${browser.channel}-${chunk[0]}-${chunk[1]}
+            description: >-
+              A subset of WPT's "${chunk[0]}" tests (chunk number ${chunk[1]}
+              of ${chunk[2]}), run in the ${browser.channel} release of
+              ${browser.name}.
+            owner: ${event.pusher.email}
+            source: ${event.repository.url}
+          payload:
+            image: harjgam/web-platform-tests:0.14
+            maxRunTime: 7200
+            artifacts:
+              public/results:
+                path: /home/test/artifacts
+                type: directory
+            command:
+              - /bin/bash
+              - --login
+              - -c
+              - "~/start.sh ${event.repository.url} ${event.ref[len('refs/heads/'):]} ${event.after} ${browser.name} ${browser.channel} &&
+              cd ~/web-platform-tests &&
+              ./tools/ci/ci_taskcluster.sh ${browser.name} ${browser.channel} ${chunk[0]} ${chunk[1]} ${chunk[2]}"
   # > NOTE: A well-designed template should produce `tasks: []` for any
   # > unrecognized `task_for` values; this allows later expansion of this
   # > service to handle more events.

diff --git a/tools/ci/ci_resources_unittest.sh b/tools/ci/ci_resources_unittest.sh
@@ -17,7 +17,7 @@ main() {
     export PATH=$HOME/firefox:$PATH
 
     cd $WPT_ROOT/resources/test
-    tox -- --binary=$HOME/browsers/firefox/firefox
+    tox -- --binary=$HOME/browsers/nightly/firefox/firefox
 }
 
 main
diff --git a/tools/ci/ci_taskcluster.sh b/tools/ci/ci_taskcluster.sh
@@ -3,8 +3,8 @@
 ./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
+    ./wpt run firefox --log-tbpl=../artifacts/log_tbpl.log --log-tbpl-level=info --log-wptreport=../artifacts/wpt_report.json --log-mach=- --this-chunk=$4 --total-chunks=$5 --test-type=$3 -y --install-browser --channel=$2 --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
+    ./wpt run chrome --log-tbpl=../artifacts/log_tbpl.log --log-tbpl-level=info --log-wptreport=../artifacts/wpt_report.json --log-mach=- --channel=$2 --this-chunk=$4 --total-chunks=$5 --test-type=$3 -y  --no-pause --no-restart-on-unexpected --install-fonts --no-fail-on-unexpected
 fi
 gzip ../artifacts/wpt_report.json
diff --git a/tools/docker/start.sh b/tools/docker/start.sh
@@ -15,6 +15,7 @@ REMOTE=${1:-https://github.com/web-platform-tests/wpt}
 BRANCH=${2:-master}
 REV=${3:-FETCH_HEAD}
 BROWSER=${4:-all}
+CHANNEL=${5:-nightly}
 
 cd ~
 
@@ -32,10 +33,22 @@ git checkout -b build ${REV}
 
 sudo sh -c './wpt make-hosts-file >> /etc/hosts'
 
-if [[ $BROWSER == "chrome"* ]] || [[ "$BROWSER" == all ]]
+if [[ $BROWSER == "chrome" ]] || [[ "$BROWSER" == all ]]
 then
     # Install Chrome dev
-    deb_archive=google-chrome-unstable_current_amd64.deb
+    if [[ "$CHANNEL" == "dev" ]] || [[ "$CHANNEL" == "nightly" ]]
+    then
+       deb_archive=google-chrome-unstable_current_amd64.deb
+    elif [[ "$CHANNEL" == "beta" ]]
+    then
+        deb_archive=google-chrome-beta_current_amd64.deb
+    elif [[ "$CHANNEL" == "stable" ]]
+    then
+        deb_archive=google-chrome-stable_current_amd64.deb
+    else
+        echo Unrecognized release channel: $CHANNEL >&2
+        exit 1
+    fi
     wget https://dl.google.com/linux/direct/$deb_archive
 
     sudo apt-get -qqy update && sudo gdebi -n $deb_archive