Skip to content

Commit f442026

Browse files
gsmetgsmet
authored
Merge pull request #50651 from gsmet/semeru
Include some testing with Semeru 21 in our CI matrix
2 parents 70552ed + 261b8ae commit f442026

File tree

28 files changed

+811
-448
lines changed

28 files changed

+811
-448
lines changed

‎.github/matrix-jvm-tests.json‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"name": "JVM Tests - JDK 17",
44
"category": "Runtime",
55
"java-version": 17,
6+
"java-distribution": "temurin",
67
"maven_args": "$JVM_TEST_MAVEN_ARGS",
78
"maven_opts": "-Xmx2g -XX:MaxMetaspaceSize=1g",
89
"os-name": "ubuntu-latest",
@@ -12,6 +13,7 @@
1213
"name": "JVM Tests - JDK 21",
1314
"category": "Runtime",
1415
"java-version": 21,
16+
"java-distribution": "temurin",
1517
"java-version-gradle": 17,
1618
"maven_args": "$JVM_TEST_MAVEN_ARGS",
1719
"maven_opts": "-Xmx3g -XX:MaxMetaspaceSize=1g",
@@ -22,6 +24,7 @@
2224
"name": "JVM Tests - JDK 25",
2325
"category": "Runtime",
2426
"java-version": 25,
27+
"java-distribution": "temurin",
2528
"java-version-gradle": 17,
2629
"maven_args": "$JVM_TEST_MAVEN_ARGS",
2730
"maven_opts": "-Xmx3g -XX:MaxMetaspaceSize=1g",
@@ -32,15 +35,28 @@
3235
"name": "JVM Tests - JDK 17 Windows",
3336
"category": "Runtime",
3437
"java-version": 17,
38+
"java-distribution": "temurin",
3539
"maven_args": "-DskipDocs -Dformat.skip",
3640
"maven_opts": "-Xmx2g -XX:MaxMetaspaceSize=1g",
3741
"os-name": "windows-latest",
3842
"modules": "-pl\n!docs\n-Dno-test-modules"
3943
},
44+
{
45+
"name": "JVM Tests - JDK 21 Semeru",
46+
"category": "Runtime",
47+
"java-version": 21,
48+
"java-distribution": "semeru",
49+
"java-version-gradle": 17,
50+
"maven_args": "$JVM_TEST_MAVEN_ARGS",
51+
"maven_opts": "-Xmx3g -XX:MaxMetaspaceSize=1g",
52+
"os-name": "ubuntu-latest",
53+
"modules": "-pl\n!docs\n-Dno-test-modules"
54+
},
4055
{
4156
"name": "JVM Integration Tests - JDK 17",
4257
"category": "Integration",
4358
"java-version": 17,
59+
"java-distribution": "temurin",
4460
"maven_args": "$JVM_TEST_MAVEN_ARGS",
4561
"maven_opts": "-Xmx2g -XX:MaxMetaspaceSize=1g",
4662
"os-name": "ubuntu-latest",
@@ -50,6 +66,7 @@
5066
"name": "JVM Integration Tests - JDK 21",
5167
"category": "Integration",
5268
"java-version": 21,
69+
"java-distribution": "temurin",
5370
"maven_args": "$JVM_TEST_MAVEN_ARGS",
5471
"maven_opts": "-Xmx3g -XX:MaxMetaspaceSize=1g",
5572
"os-name": "ubuntu-latest",
@@ -59,6 +76,7 @@
5976
"name": "JVM Integration Tests - JDK 25",
6077
"category": "Integration",
6178
"java-version": 25,
79+
"java-distribution": "temurin",
6280
"maven_args": "$JVM_TEST_MAVEN_ARGS",
6381
"maven_opts": "-Xmx3g -XX:MaxMetaspaceSize=1g",
6482
"os-name": "ubuntu-latest",
@@ -68,9 +86,20 @@
6886
"name": "JVM Integration Tests - JDK 17 Windows",
6987
"category": "Integration",
7088
"java-version": 17,
89+
"java-distribution": "temurin",
7190
"maven_args": "-DskipDocs -Dformat.skip",
7291
"maven_opts": "-Xmx2g -XX:MaxMetaspaceSize=1g",
7392
"os-name": "windows-latest",
7493
"modules": "-f\nintegration-tests\n-pl\n!gradle\n-pl\n!maven\n-pl\n!devmode\n-pl\n!devtools"
94+
},
95+
{
96+
"name": "JVM Integration Tests - JDK 21 Semeru",
97+
"category": "Integration",
98+
"java-version": 21,
99+
"java-distribution": "semeru",
100+
"maven_args": "$JVM_TEST_MAVEN_ARGS",
101+
"maven_opts": "-Xmx3g -XX:MaxMetaspaceSize=1g",
102+
"os-name": "ubuntu-latest",
103+
"modules": "-f\nintegration-tests\n-pl\n!gradle\n-pl\n!maven\n-pl\n!devmode\n-pl\n!devtools"
75104
}
76105
]

‎.github/workflows/ci-actions-incremental.yml‎

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -604,15 +604,24 @@ jobs:
604604
- {
605605
name: "17",
606606
java-version: 17,
607+
java-distribution: "temurin",
607608
os-name: "ubuntu-latest",
608609
tag: "maven-jdk-17"
609610
}
610611
- {
611612
name: "17 Windows",
612613
java-version: 17,
614+
java-distribution: "temurin",
613615
os-name: "windows-latest",
614616
tag: "maven-jdk-17-windows"
615617
}
618+
- {
619+
name: "21 Semeru",
620+
java-version: 21,
621+
java-distribution: "semeru",
622+
os-name: "ubuntu-latest",
623+
tag: "maven-jdk-21-semeru"
624+
}
616625
steps:
617626
- uses: runs-on/action@v2
618627
- name: Gradle Enterprise environment
@@ -646,7 +655,7 @@ jobs:
646655
- name: Set up JDK ${{ matrix.java.java-version }}
647656
uses: actions/setup-java@v5
648657
with:
649-
distribution: temurin
658+
distribution: ${{ matrix.java.java-distribution || 'temurin' }}
650659
java-version: ${{ matrix.java.java-version }}
651660
- name: Setup Develocity Build Scan capture
652661
uses: gradle/develocity-actions/[email protected]
@@ -809,21 +818,31 @@ jobs:
809818
- {
810819
name: "17",
811820
java-version: 17,
821+
java-distribution: "temurin",
812822
os-name: "ubuntu-latest",
813823
tag: "devtools-jdk-17"
814824
}
815825
- {
816826
name: "21",
817827
java-version: 21,
828+
java-distribution: "temurin",
818829
os-name: "ubuntu-latest",
819830
tag: "devtools-jdk-21"
820831
}
821832
- {
822833
name: "17 Windows",
823834
java-version: 17,
835+
java-distribution: "temurin",
824836
os-name: "windows-latest",
825837
tag: "devtools-jdk-17-windows"
826838
}
839+
- {
840+
name: "21 Semeru",
841+
java-version: 21,
842+
java-distribution: "semeru",
843+
os-name: "ubuntu-latest",
844+
tag: "devtools-jdk-21-semeru"
845+
}
827846
steps:
828847
- uses: runs-on/action@v2
829848
- name: Gradle Enterprise environment
@@ -852,7 +871,7 @@ jobs:
852871
- name: Set up JDK ${{ matrix.java.java-version }}
853872
uses: actions/setup-java@v5
854873
with:
855-
distribution: temurin
874+
distribution: ${{ matrix.java.java-distribution || 'temurin' }}
856875
java-version: ${{ matrix.java.java-version }}
857876
- name: Setup Develocity Build Scan capture
858877
uses: gradle/develocity-actions/[email protected]
@@ -913,20 +932,30 @@ jobs:
913932
name: "17",
914933
java-version: 17,
915934
os-name: "ubuntu-latest",
935+
java-distribution: "temurin",
916936
tag: "kubernetes-jdk-17"
917937
}
918938
- {
919939
name: "21",
920940
java-version: 21,
941+
java-distribution: "temurin",
921942
os-name: "ubuntu-latest",
922943
tag: "kubernetes-jdk-21"
923944
}
924945
- {
925946
name: "17 Windows",
926947
java-version: 17,
948+
java-distribution: "temurin",
927949
os-name: "windows-latest",
928950
tag: "kubernetes-jdk-17-windows"
929951
}
952+
- {
953+
name: "21 Semeru",
954+
java-version: 21,
955+
java-distribution: "semeru",
956+
os-name: "ubuntu-latest",
957+
tag: "kubernetes-jdk-21-semeru"
958+
}
930959
steps:
931960
- uses: runs-on/action@v2
932961
- name: Gradle Enterprise environment
@@ -955,7 +984,7 @@ jobs:
955984
- name: Set up JDK ${{ matrix.java.java-version }}
956985
uses: actions/setup-java@v5
957986
with:
958-
distribution: temurin
987+
distribution: ${{ matrix.java.java-distribution || 'temurin' }}
959988
java-version: ${{ matrix.java.java-version }}
960989
- name: Setup Develocity Build Scan capture
961990
uses: gradle/develocity-actions/[email protected]

‎extensions/jfr/deployment/pom.xml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,19 @@
5757
</plugin>
5858
</plugins>
5959
</build>
60+
<profiles>
61+
<profile>
62+
<!-- JFR support might be improved in 25 but for now we are testing 17 and 21 and it is not supported at all -->
63+
<id>skip-tests-on-semeru</id>
64+
<activation>
65+
<property>
66+
<name>java.vendor</name>
67+
<value>IBM Corporation</value>
68+
</property>
69+
</activation>
70+
<properties>
71+
<maven.test.skip>true</maven.test.skip>
72+
</properties>
73+
</profile>
74+
</profiles>
6075
</project>

‎extensions/jfr/deployment/src/test/java/io/quarkus/jfr/test/JfrDevModeTest.java‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎extensions/jfr/deployment/src/test/java/io/quarkus/jfr/test/JfrTest.java‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/VirtualThreadMetricsTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,11 @@
1212
import org.junit.jupiter.api.extension.RegisterExtension;
1313

1414
import io.quarkus.micrometer.runtime.binder.virtualthreads.VirtualThreadCollector;
15+
import io.quarkus.test.DisabledOnSemeru;
1516
import io.quarkus.test.QuarkusUnitTest;
1617

1718
@EnabledForJreRange(min = JRE.JAVA_21)
19+
@DisabledOnSemeru(reason = "JFR is not supported on Semeru yet")
1820
public class VirtualThreadMetricsTest {
1921

2022
@RegisterExtension

‎extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/VirtualThreadMetricsWithTagsTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,11 @@
1212
import org.junit.jupiter.api.extension.RegisterExtension;
1313

1414
import io.quarkus.micrometer.runtime.binder.virtualthreads.VirtualThreadCollector;
15+
import io.quarkus.test.DisabledOnSemeru;
1516
import io.quarkus.test.QuarkusUnitTest;
1617

1718
@EnabledForJreRange(min = JRE.JAVA_21)
19+
@DisabledOnSemeru(reason = "JFR is not supported on Semeru yet")
1820
public class VirtualThreadMetricsWithTagsTest {
1921

2022
@RegisterExtension

0 commit comments

Comments
 (0)