Merged r14415 and r14522 from trunk to 3.1-stable (#20251)

travis: allow ui test failure.

Refer:
https://github.com/travis-ci/travis-ci/issues/3225

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14523 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/.travis.yml b/.travis.yml
index 45767e221ff1d71a27669d832dde47b57832140a..ab505ce683254c2f02858c145a325c3867ebb361 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,6 +39,14 @@ env:
   - "SUITE=ui          DB=sqlite3"
 matrix:
   allow_failures:
+    # http://www.redmine.org/issues/20251
+    - env: "SUITE=ui          DB=postgresql"
+    - env: "SUITE=ui          DB=mysql-5.5"
+    - env: "SUITE=ui          DB=mysql-5.6"
+    - env: "SUITE=ui          DB=mysql-5.7-dmr"
+    - env: "SUITE=ui          DB=mariadb-5.5"
+    - env: "SUITE=ui          DB=mariadb-10.0"
+    - env: "SUITE=ui          DB=sqlite3"
     # SCM tests fail randomly due to IO.popen().
     # http://www.redmine.org/issues/19091
     # https://github.com/jruby/jruby/issues/779