Merge pull request #1830 from xfxyjwf/travis

Remove linux tests from travis.

.travis.yml

@@ -5,7 +5,6 @@ sudo: required
 # rvm/gemfile/jdk/etc. entries rather than manually doing the work.
 language: cpp
 os:
-  - linux
   - osx
 # The Objective C build needs Xcode 7.0 or later.
 osx_image: xcode7.3
@@ -47,23 +46,17 @@ matrix:
     # which doesn't work on OS X.
     - os: osx
       env: CONFIG=golang
-    # OS X/iOS tests of Objective C (needs Xcode, so it won't work on other
-    # platforms).
-    - os: linux
-      env: CONFIG=objectivec_ios_debug
-    - os: linux
-      env: CONFIG=objectivec_ios_release
-    - os: linux
-      env: CONFIG=objectivec_osx
-    - os: linux
-      env: CONFIG=objectivec_cocoapods_integration
+  include:
     # The dotnet environment requires Ubuntu 14.04 or 16.04. This
     # configuration is effectively an "extra" one, outside the
     # autogenerated matrix.
-  include:
     - os: linux
       env: CONFIG=csharp
       dist: trusty
+    # This test is kept on travis because it doesn't play nicely with other
+    # tests on jenkins running in parallel.
+    - os: linux
+      env: CONFIG=cpp_distcheck
   allow_failures:
     # These currently do not work on OS X but are being worked on by @haberman.
     - os: osx