From b7657eae25437690f4f5eb2be74660b6dc615703 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20J=C3=A4genstedt?= <philip@foolip.org>
Date: Mon, 19 Nov 2018 18:46:28 +0000
Subject: [PATCH] Bug 1507908 [wpt PR 14096] - Allow stability-checker failures
 on Travis and report them on Taskcluster, a=testonly

Automatic update from web-platform-testsAllow stability-checker failures on Travis and report them on Taskcluster (#14096)

Fixes https://github.com/web-platform-tests/wpt/issues/7660.

https://github.com/web-platform-tests/wpt/issues/13194 remains open to
verify that Taskcluster isn't failing to detect flakiness that Travis
would.
--

wpt-commits: bcd2471a16325fada550e05dad2b17895a232c6a
wpt-pr: 14096
---
 testing/web-platform/tests/.taskcluster.yml | 5 +----
 testing/web-platform/tests/.travis.yml      | 8 ++++----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/testing/web-platform/tests/.taskcluster.yml b/testing/web-platform/tests/.taskcluster.yml
index bcac7f5abbc4b..35aad403ce7e4 100644
--- a/testing/web-platform/tests/.taskcluster.yml
+++ b/testing/web-platform/tests/.taskcluster.yml
@@ -149,12 +149,9 @@ tasks:
                       ${browser.name}
                       ${browser.channel};
                     cd ~/web-platform-tests;
-                    result=0;
                     ./tools/ci/taskcluster-run.py
                       --commit-range HEAD^
                       ${browser.name}
                       --
                       --channel=${browser.channel}
-                      ${operation.extra_args} || result=$?;
-                    echo $result > ../artifacts/run-return-code.txt;
-                    echo "Command exited with code $result (failures are allowed while this task is being vetted)."
+                      ${operation.extra_args};
diff --git a/testing/web-platform/tests/.travis.yml b/testing/web-platform/tests/.travis.yml
index d89fadae77d2e..8d4152f0285cd 100644
--- a/testing/web-platform/tests/.travis.yml
+++ b/testing/web-platform/tests/.travis.yml
@@ -51,8 +51,7 @@ matrix:
         apt:
           packages:
             - libnss3-tools
-      env:
-        - JOB=stability SCRIPT=tools/ci/ci_stability.sh PRODUCT=firefox:nightly
+      env: JOB=stability SCRIPT=tools/ci/ci_stability.sh PRODUCT=firefox:nightly
     - name: "stability (Chrome Dev)"
       if: type = pull_request
       os: linux
@@ -62,8 +61,7 @@ matrix:
           packages:
             - libappindicator1
             - fonts-liberation
-      env:
-        - JOB=stability SCRIPT=tools/ci/ci_stability.sh PRODUCT=chrome:dev
+      env: JOB=stability SCRIPT=tools/ci/ci_stability.sh PRODUCT=chrome:dev
     - name: "tools/ unittests (Python 2)"
       if: type = pull_request
       os: linux
@@ -103,6 +101,8 @@ matrix:
     - env:  # exclude empty env from the top-level above
   allow_failures:
     - env: JOB=build_css SCRIPT=css/build-css-testsuites.sh
+    - env: JOB=stability SCRIPT=tools/ci/ci_stability.sh PRODUCT=firefox:nightly
+    - env: JOB=stability SCRIPT=tools/ci/ci_stability.sh PRODUCT=chrome:dev
 script:
   - ./tools/ci/run.sh
 cache: