From 9702b9f78508dcbb2df4d090cdac6c3df41cdddb Mon Sep 17 00:00:00 2001
From: Feng Xiao <xfxyjwf@gmail.com>
Date: Fri, 22 Jul 2016 16:04:11 -0700
Subject: Keep cpp_distcheck on travis for now.

When it runs in parallel with other jenkins tests, multiple tests start
to fail probably because cpp_distcheck will update the C++ lib that
other tests (such as python_cpp) are depending on.

Change-Id: Ibca0243084bb6b81c811b62c75288e20cc2aabf5
---
 .travis.yml                       | 10 +++++++---
 jenkins/pull_request_in_docker.sh |  1 -
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c4717acf..1417cb98 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,13 +46,17 @@ matrix:
     # which doesn't work on OS X.
     - os: osx
       env: CONFIG=golang
-  # The dotnet environment requires Ubuntu 14.04 or 16.04. This
-  # configuration is effectively an "extra" one, outside the
-  # autogenerated matrix.
   include:
+    # The dotnet environment requires Ubuntu 14.04 or 16.04. This
+    # configuration is effectively an "extra" one, outside the
+    # autogenerated matrix.
     - 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
diff --git a/jenkins/pull_request_in_docker.sh b/jenkins/pull_request_in_docker.sh
index a99d88b1..78a9253a 100755
--- a/jenkins/pull_request_in_docker.sh
+++ b/jenkins/pull_request_in_docker.sh
@@ -48,7 +48,6 @@ $TIME_CMD $TEST_SCRIPT cpp > >(tee $CPP_STDOUT) 2> >(tee $CPP_STDERR >&2)
 # Other tests are run in parallel.
 
 parallel --results $LOG_OUTPUT_DIR --joblog $OUTPUT_DIR/joblog $TEST_SCRIPT ::: \
-  cpp_distcheck \
   csharp \
   java_jdk7 \
   javanano_jdk7 \
-- 
cgit v1.2.3