[Jython-checkins] jython: Choose Travis CI distributions to match JDKs

[jeff.allen]

https://hg.python.org/jython/rev/15d80d250e51
changeset:   8267:15d80d250e51
user:        Jeff Allen <ja.py at farowl.co.uk>
date:        Fri Aug 02 07:19:27 2019 +0100
summary:
  Choose Travis CI distributions to match JDKs

Unfortunately complex matrix of Linux distribution and available JDKs.
Installs ant for OSX and Linux xenial.

files:
  .travis.yml |  49 ++++++++++++++++++++++++----------------
  build.xml   |   9 ++++---
  2 files changed, 34 insertions(+), 24 deletions(-)


diff --git a/.travis.yml b/.travis.yml
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,30 +1,39 @@
 language: java
 
 addons:
-  homebrew:
-    update: true
-    packages: ant
-
-matrix:
-  include:
-    - jdk: openjdk7
-    # - jdk: openjdk8
-    - jdk: oraclejdk8
-    # - jdk: oraclejdk9
-    # - jdk: oraclejdk11  # times out
-    - os: osx
-      name: "JDK: oraclejdk10 Java on macOS"
-      install: export JAVA_HOME=$(/usr/libexec/java_home)
-
-addons:
   hostname: jyshort
 
-before_install:
-  - cat /etc/hosts # optionally check the content *after*
+  homebrew: # only active on osx
+    update: true
+    packages:
+      - ant
+
+
+matrix:
+  include:
+    - os: linux
+      dist: precise
+      jdk: oraclejdk7
 
-install: ant
+    - os: linux
+      dist: xenial
+      addons:
+        apt:
+          packages:
+            - ant
+      jdk: openjdk11
 
-script: ant && ant regrtest-travis
+    - os: osx
+      osx_image: xcode9.3 # Last supporting Java 8
+      jdk: oraclejdk8
+
+
+install:
+  - ant developer-build
+
+
+script:
+  - ant regrtest-travis
 
 notifications:
   email:
diff --git a/build.xml b/build.xml
--- a/build.xml
+++ b/build.xml
@@ -1106,13 +1106,14 @@
             <arg value="-w"/> <!-- re-run failed tests in verbose mode -->
             <!-- Only run the tests that are expected to work on Jython -->
             <arg value="--expected"/>
-            <arg value="-j"/>
-            <arg value="${junit.reports}"/>
             <arg value="--use"/>
             <arg value="network,subprocess"/>
             <!-- Exclude particular tests troublesome on the build bots -->
             <arg value="--exclude"/>
+            <arg value="test_gc"/> <!-- intermittently fails/hangs (xenial) -->
+            <arg value="test_mailbox"/>
             <arg value="test_select_new"/>
+            <arg value="test_smtpnet"/>
             <arg value="test_socket"/>
         </exec>
     </target>
@@ -1124,13 +1125,13 @@
             <arg value="-w"/> <!-- re-run failed tests in verbose mode -->
             <!-- Only run the tests that are expected to work on Jython -->
             <arg value="--expected"/>
-            <arg value="-j"/>
-            <arg value="${junit.reports}"/>
             <arg value="--use"/>
             <arg value="network,subprocess"/>
             <!-- Exclude particular tests troublesome on the build bots -->
             <arg value="--exclude"/>
+            <arg value="test_mailbox"/>
             <arg value="test_select_new"/>
+            <arg value="test_smtpnet"/>
             <arg value="test_socket"/>
         </exec>
     </target>

-- 
Repository URL: https://hg.python.org/jython