Bump Java from 14 to 15 in CI (#1252)

* Bump Java from 14 to 15 in CI

Signed-off-by: Pavol Loffay <ploffay@redhat.com>

* Review comments

Signed-off-by: Pavol Loffay <ploffay@redhat.com>

* adjust comment

Signed-off-by: Pavol Loffay <ploffay@redhat.com>

* Bump jacoco to 0.8.6

Signed-off-by: Pavol Loffay <ploffay@redhat.com>

* maxJavaVersionForTests

Signed-off-by: Pavol Loffay <ploffay@redhat.com>
This commit is contained in:
Pavol Loffay 2020-09-24 14:27:33 +02:00 committed by GitHub
parent fc47fd56e5
commit 91b177165c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 17 additions and 11 deletions

View File

@ -29,5 +29,5 @@ jobs:
run: | run: |
./gradlew jib -PtargetJDK=8 -Djib.httpTimeout=120000 -Djib.console=plain ./gradlew jib -PtargetJDK=8 -Djib.httpTimeout=120000 -Djib.console=plain
./gradlew jib -PtargetJDK=11 -Djib.httpTimeout=120000 -Djib.console=plain ./gradlew jib -PtargetJDK=11 -Djib.httpTimeout=120000 -Djib.console=plain
./gradlew jib -PtargetJDK=14 -Djib.httpTimeout=120000 -Djib.console=plain ./gradlew jib -PtargetJDK=15 -Djib.httpTimeout=120000 -Djib.console=plain
working-directory: smoke-tests/play working-directory: smoke-tests/play

View File

@ -29,5 +29,5 @@ jobs:
run: | run: |
./gradlew jib -PtargetJDK=8 -Djib.httpTimeout=120000 -Djib.console=plain --stacktrace ./gradlew jib -PtargetJDK=8 -Djib.httpTimeout=120000 -Djib.console=plain --stacktrace
./gradlew jib -PtargetJDK=11 -Djib.httpTimeout=120000 -Djib.console=plain --stacktrace ./gradlew jib -PtargetJDK=11 -Djib.httpTimeout=120000 -Djib.console=plain --stacktrace
./gradlew jib -PtargetJDK=14 -Djib.httpTimeout=120000 -Djib.console=plain --stacktrace ./gradlew jib -PtargetJDK=15 -Djib.httpTimeout=120000 -Djib.console=plain --stacktrace
working-directory: smoke-tests/springboot working-directory: smoke-tests/springboot

View File

@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:
matrix: matrix:
java: [8, 11, 14] java: [8, 11, 15]
fail-fast: false fail-fast: false
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2

View File

@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:
matrix: matrix:
java: [8, 11, 14] java: [8, 11, 15]
fail-fast: false fail-fast: false
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2

View File

@ -2,10 +2,10 @@
#### Java versions #### Java versions
Open Telemetry Auto Instrumentation's minimal supported version is java 7. Open Telemetry Auto Instrumentation's minimal supported version is java 8.
All jar files that we produce, unless noted otherwise, have bytecode All jar files that we produce, unless noted otherwise, have bytecode
compatible with java 7 runtime. In addition to that we test our code with all compatible with java 8 runtime. Our test suite is executed against
later java versions as well: from 8 to 14. java 8, all LTS versions and the latest non-LTS version.
Some libraries that we auto-instrument may have higher minimal requirements. Some libraries that we auto-instrument may have higher minimal requirements.
In this case we compile and test corresponding auto-instrumentation with In this case we compile and test corresponding auto-instrumentation with

View File

@ -1,7 +1,7 @@
apply plugin: "jacoco" apply plugin: "jacoco"
jacoco { jacoco {
toolVersion = "0.8.5" toolVersion = "0.8.6"
} }
jacocoTestReport { jacocoTestReport {

View File

@ -2,6 +2,12 @@ apply from: "$rootDir/gradle/instrumentation.gradle"
apply from: "$rootDir/gradle/test-with-scala.gradle" apply from: "$rootDir/gradle/test-with-scala.gradle"
apply plugin: 'org.unbroken-dome.test-sets' apply plugin: 'org.unbroken-dome.test-sets'
ext {
// TODO remove once Scala/akka supports Java 15
// https://docs.scala-lang.org/overviews/jdk-compatibility/overview.html
maxJavaVersionForTests = JavaVersion.VERSION_14
}
testSets { testSets {
version101Test { version101Test {
dirName = 'test' dirName = 'test'

View File

@ -45,7 +45,7 @@ class PlaySmokeTest extends SmokeTest {
stopTarget() stopTarget()
where: where:
jdk << [8, 11, 14] jdk << [8, 11, 15]
} }
} }

View File

@ -63,6 +63,6 @@ class SpringBootSmokeTest extends SmokeTest {
stopTarget() stopTarget()
where: where:
jdk << [8, 11, 14] jdk << [8, 11, 15]
} }
} }

View File

@ -55,6 +55,6 @@ class SpringBootWithSamplingSmokeTest extends SmokeTest {
stopTarget() stopTarget()
where: where:
jdk << [8, 11, 14] jdk << [8, 11, 15]
} }
} }