Skip to content

Commit 2a09371

Browse files
authored
Run JDK 21 tests on PRs (#18717)
1 parent 696e1e6 commit 2a09371

File tree

2 files changed

+6
-18
lines changed

2 files changed

+6
-18
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,14 @@ jobs:
2424
strategy:
2525
fail-fast: false
2626
matrix:
27+
jdk: [ "17", "21" ]
2728
pattern: [ "C*", "H*,U*,V*", "N*,Q*,S*", "B*,O*,R*", "G*,J*,K*", "F*,L*,M*", "A*,D*,I*,X*,Y*,Z*", "E*,P*,T*,W*"]
2829
uses: ./.github/workflows/worker.yml
2930
with:
3031
script: .github/scripts/run_unit-tests -Dtest=!QTest,'${{ matrix.pattern }}' -Dmaven.test.failure.ignore=true
31-
jdk: 17
3232
artifact_prefix: "unit-test-reports"
33-
key: "test-jdk17-[${{ matrix.pattern }}]"
33+
jdk: ${{ matrix.jdk }}
34+
key: "test-jdk${{ matrix.jdk }}-[${{ matrix.pattern }}]"
3435

3536
validate-dist:
3637
uses: ./.github/workflows/worker.yml
@@ -71,21 +72,6 @@ jobs:
7172
artifacts_to_download: "unit-test-reports-*"
7273
key: "coverage-jacoco"
7374

74-
run-unit-tests-all-jdk:
75-
needs: test-report
76-
name: "unit tests(all jdk)"
77-
if: ${{ !cancelled() && ( contains( github.event.pull_request.labels.*.name, 'tests:all-jdk') || github.event_name == 'push' ) }}
78-
strategy:
79-
fail-fast: false
80-
matrix:
81-
jdk: [ "21" ]
82-
pattern: [ "C*", "H*,U*,V*", "N*,Q*,S*", "B*,O*,R*", "G*,J*,K*", "F*,L*,M*", "A*,D*,I*,X*,Y*,Z*", "E*,P*,T*,W*"]
83-
uses: ./.github/workflows/worker.yml
84-
with:
85-
script: .github/scripts/run_unit-tests -Dtest=!QTest,'${{ matrix.pattern }}' -fae
86-
jdk: ${{ matrix.jdk }}
87-
key: "test-jdk${{ matrix.jdk }}-[${{ matrix.pattern }}]"
88-
8975
# this will be running in parallel with the ITs later; but until that migration happens - run them in parallel with normal tests
9076
run-qtest:
9177
strategy:

processing/src/test/java/org/apache/druid/java/util/common/CompressionUtilsTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import org.apache.druid.utils.CompressionUtils;
3434
import org.junit.Assert;
3535
import org.junit.Before;
36+
import org.junit.Ignore;
3637
import org.junit.Rule;
3738
import org.junit.Test;
3839
import org.junit.rules.TemporaryFolder;
@@ -551,8 +552,9 @@ public void testZeroRemainingInputStream() throws IOException
551552
}
552553

553554
// If this ever passes, er... fails to fail... then the bug is fixed
554-
@Test(expected = AssertionError.class)
555555
// http://bugs.java.com/bugdatabase/view_bug.do?bug_id=7036144
556+
@Test(expected = AssertionError.class)
557+
@Ignore("This test fails in JDK 21, looks like the bug was fixed in 21.0.9 at least.")
556558
public void testGunzipBug() throws IOException
557559
{
558560
final ByteArrayOutputStream tripleGzByteStream = new ByteArrayOutputStream(GZ_BYTES.length * 3);

0 commit comments

Comments
 (0)