From 81f80e459e84eaa338b1bdc5906837aaea9e953c Mon Sep 17 00:00:00 2001 From: Felix Schumacher Date: Sun, 3 Feb 2019 12:39:27 +0100 Subject: [PATCH 1/6] Try running on java-ea for travis builds. --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index b49fffeadc5..820db533770 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,6 +32,10 @@ matrix: script: - ant -Ddisable-svnCheck=true -Djava.awt.headless=true -Drmi_force_localhost=true -Dskip.bug52310=true coverage-travis sudo: true # otherwise TEST_HTTPS.jmx -> analytics.usa.gov does not work + - jdk: openjdk-ea + script: + - ant -Ddisable-svnCheck=true -Djava.awt.headless=true -Drmi_force_localhost=true -Dskip.bug52310=true coverage-travis + sudo: true # otherwise TEST_HTTPS.jmx -> analytics.usa.gov does not work # disable building with jdk9 as it has a bug and will not compile JMeter # see https://bugs.java.com/bugdatabase/view_bug.do?bug_id=8193802 # - jdk: oraclejdk9 From 2228983177af8a93af14da04a0459ce5f626d8d7 Mon Sep 17 00:00:00 2001 From: Felix Schumacher Date: Sun, 3 Feb 2019 12:57:58 +0100 Subject: [PATCH 2/6] Allow failures for Java EA. We are interested in those, but it shouldn't flag the build completly failed. --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 820db533770..d0f70493648 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,6 +36,8 @@ matrix: script: - ant -Ddisable-svnCheck=true -Djava.awt.headless=true -Drmi_force_localhost=true -Dskip.bug52310=true coverage-travis sudo: true # otherwise TEST_HTTPS.jmx -> analytics.usa.gov does not work + - allow_failures: + - jdk: openjdk-ea # disable building with jdk9 as it has a bug and will not compile JMeter # see https://bugs.java.com/bugdatabase/view_bug.do?bug_id=8193802 # - jdk: oraclejdk9 From 079efd4781b472ca050a14906c76c97c9e6ffcb6 Mon Sep 17 00:00:00 2001 From: Felix Schumacher Date: Sun, 3 Feb 2019 13:38:11 +0100 Subject: [PATCH 3/6] Set ANT_OPTS for all builds. --- .travis.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index d0f70493648..00c00a1a963 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,10 @@ before_install: # skip default "install" command install: true +env: + global: + - ANT_OPTS="-Ddisable-svnCheck=true -Djava.awt.headless=true -Drmi_force_localhost=true -Dskip.bug52310=true" + matrix: include: - jdk: oraclejdk8 @@ -21,20 +25,20 @@ matrix: script: ant -Djava.awt.headless=true checkstyle - jdk: oraclejdk8 script: - - ant -Ddisable-svnCheck=true -Djava.awt.headless=true -Drmi_force_localhost=true -Dskip.bug52310=true coverage-travis + - ant coverage-travis after_success: - bash <(curl -s https://codecov.io/bash) sudo: true # otherwise TEST_HTTPS.jmx -> analytics.usa.gov does not work - jdk: openjdk8 script: - - ant -Ddisable-svnCheck=true -Djava.awt.headless=true -Drmi_force_localhost=true -Dskip.bug52310=true coverage-travis + - ant coverage-travis - jdk: openjdk11 script: - - ant -Ddisable-svnCheck=true -Djava.awt.headless=true -Drmi_force_localhost=true -Dskip.bug52310=true coverage-travis + - ant coverage-travis sudo: true # otherwise TEST_HTTPS.jmx -> analytics.usa.gov does not work - jdk: openjdk-ea script: - - ant -Ddisable-svnCheck=true -Djava.awt.headless=true -Drmi_force_localhost=true -Dskip.bug52310=true coverage-travis + - ant coverage-travis sudo: true # otherwise TEST_HTTPS.jmx -> analytics.usa.gov does not work - allow_failures: - jdk: openjdk-ea From 4f67f7edc69f165fef5064636c7338ccc4df0799 Mon Sep 17 00:00:00 2001 From: Felix Schumacher Date: Sun, 3 Feb 2019 14:37:44 +0100 Subject: [PATCH 4/6] Only run coverage on Oracle JDK 8, as it is the only build, where it is getting used --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 00c00a1a963..17afe30ee7e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,14 +31,14 @@ matrix: sudo: true # otherwise TEST_HTTPS.jmx -> analytics.usa.gov does not work - jdk: openjdk8 script: - - ant coverage-travis + - ant test - jdk: openjdk11 script: - - ant coverage-travis + - ant test sudo: true # otherwise TEST_HTTPS.jmx -> analytics.usa.gov does not work - jdk: openjdk-ea script: - - ant coverage-travis + - ant test sudo: true # otherwise TEST_HTTPS.jmx -> analytics.usa.gov does not work - allow_failures: - jdk: openjdk-ea From 79098f2fdbdbf33547d4bfd66cb5f9c571562bf1 Mon Sep 17 00:00:00 2001 From: Felix Schumacher Date: Sun, 3 Feb 2019 14:40:26 +0100 Subject: [PATCH 5/6] Put 'allow_failures' on the right level inside 'matrix' --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 17afe30ee7e..8a6bcc46b54 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,8 +40,8 @@ matrix: script: - ant test sudo: true # otherwise TEST_HTTPS.jmx -> analytics.usa.gov does not work - - allow_failures: - - jdk: openjdk-ea + allow_failures: + - jdk: openjdk-ea # disable building with jdk9 as it has a bug and will not compile JMeter # see https://bugs.java.com/bugdatabase/view_bug.do?bug_id=8193802 # - jdk: oraclejdk9 From 02829d226e475253c6f7bd98a28915b7eab4333d Mon Sep 17 00:00:00 2001 From: Felix Schumacher Date: Sun, 3 Feb 2019 14:49:00 +0100 Subject: [PATCH 6/6] Name the different builds. --- .travis.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8a6bcc46b54..078048c47c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,20 +23,24 @@ matrix: - jdk: oraclejdk8 env: RUN_CHECKSTYLE=true script: ant -Djava.awt.headless=true checkstyle - - jdk: oraclejdk8 + - name: Coverage on our default build with Oracle Java 8 + jdk: oraclejdk8 script: - ant coverage-travis after_success: - bash <(curl -s https://codecov.io/bash) sudo: true # otherwise TEST_HTTPS.jmx -> analytics.usa.gov does not work - - jdk: openjdk8 + - name: Tests with OpenJDK 8 + jdk: openjdk8 script: - ant test - - jdk: openjdk11 + - name: Tests with OpenJDK 11 + jdk: openjdk11 script: - ant test sudo: true # otherwise TEST_HTTPS.jmx -> analytics.usa.gov does not work - - jdk: openjdk-ea + - name: Tests with OpenJDK EA + jdk: openjdk-ea script: - ant test sudo: true # otherwise TEST_HTTPS.jmx -> analytics.usa.gov does not work