Skip to content

Commit 6329cc7

Browse files
MattyWeee123MattyWeee123
authored
Merge branch 'master' into issue6418
2 parents 8b99b62 + 2d86b48 commit 6329cc7

15 files changed

+179
-90
lines changed

‎.github/ISSUE_TEMPLATE/release_tables.md‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
name: Release Triage Tables
2+
about: An Issue to track AQAvit triage during release
3+
title: '<Month Year> Release Triage - <JDK-Version>'
4+
labels: 'release triage'
5+
assignees: ''
6+
7+
Release Pipeline link(s):
8+
<insert links here>
9+
10+
---
11+
12+
✔️ activity has successfully completed and no blocking issues found.
13+
⏳ actively triaging for this version/platform.
14+
⛔ no build planned or blocking issues for this version/platform combination.
15+
⏸️ activity not yet started.
16+
17+
<Keep only the version table that applies to what is being triaged>
18+
<JDK8 Table>
19+
20+
| Platform | Status | Results | Notes |
21+
| --- | --- | --- | --- |
22+
| **x86-64_mac** | ⏸️ | | |
23+
| **x86-64_linux** | ⏸️ | | |
24+
| **x86-64_windows** | ⏸️ | | |
25+
| **aarch64_linux** |⏸️ | | |
26+
| x86-64_alpine-linux | ⏸️ | | |
27+
| ppc64le_linux | ⏸️ | | |
28+
| ppc64_aix | ⏸️ | | |
29+
| sparcv9_solaris | ⏸️ | | |
30+
| x86-64_solaris | ⏸️ | | |
31+
| x86-32_windows |⏸️ | | |
32+
| arm_linux | ⏸️ | | separate pipeline |
33+
34+
35+
<JDK11 Table>
36+
37+
| Platform | Status | Results | Notes |
38+
| --- | --- | --- | --- |
39+
| **x86-64_mac** | ⏸️ | | |
40+
| **x86-64_linux** | ⏸️ | | |
41+
| **x86-64_windows** | ⏸️ | | |
42+
| **aarch64_linux** | ⏸️ | | |
43+
| **aarch64_mac** | ⏸️ | | |
44+
| x86-64_alpine-linux | ⏸️ | | |
45+
| ppc64le_linux | ⏸️ | | |
46+
| s390x_linux | ⏸️ | | |
47+
| ppc64_aix | ⏸️ | | |
48+
| arm_linux | ⏸️ | | |
49+
|x86-32_windows| ⏸️ | | |
50+
51+
52+
<JDK17 Table>
53+
54+
| Platform | Status | Results | Notes |
55+
| --- | --- | --- | --- |
56+
| **x86-64_mac** | ⏸️ | | |
57+
| **x86-64_linux** | ⏸️ | | |
58+
| **x86-64_windows** | ⏸️ | | |
59+
| **aarch64_linux** | ⏸️ | | |
60+
| **aarch64_mac** | ⏸️ | | |
61+
| x86-64_alpine-linux | ⏸️ | | |
62+
| ppc64le_linux | ⏸️ | | |
63+
| s390x_linux | ⏸️ | | |
64+
| ppc64_aix | ⏸️ | | |
65+
| arm_linux | ⏸️ | | |
66+
| riscv64_linux | ⏸️ | | |
67+
|x86-32_windows| ⏸️ | | |
68+
69+
70+
<JDK21 and Up Table>
71+
72+
| Platform | Status | Results | Notes |
73+
| --- | --- | --- | --- |
74+
| **x86-64_mac** | ⏸️ | | |
75+
| **x86-64_linux** | ⏸️ | | |
76+
| **x86-64_windows** | ⏸️ | | |
77+
| **aarch64_linux** | ⏸️ | | |
78+
| **aarch64_mac** | ⏸️ | | |
79+
| x86-64_alpine-linux | ⏸️ | | |
80+
| ppc64le_linux | ⏸️ | | |
81+
| s390x_linux | ⏸️ | | |
82+
| ppc64_aix | ⏸️ | | |
83+
| riscv64_linux | ⏸️ | | |
84+
| aarch64_windows| ⏸️ | | |
85+
| aarch64_alpine-linux| ⏸️ | | |
86+
87+
88+
<Results column entries are ment to link to triage comments for each platform>

‎Contributing.md‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,25 @@ You can skip `-f` in `git push` if you've never pushed your branch before.
112112
11. Convert PR to `Ready for review` once the PR is ready.
113113

114114

115+
## Code Review Process Guideline
116+
117+
To ensure high code quality, maintainability, and collaboration, all code changes should go through a structured review process before being merged into the main branch.
118+
119+
1. Assigning Reviewers
120+
- Assign at least one project committer as the reviewer.
121+
- Choose a reviewer with relevant knowledge of the codebase or feature.
122+
2. Reviewer Responsibilities
123+
- Review the code for:
124+
- Correctness and functionality
125+
- Code style and readability
126+
- Test coverage and reliability
127+
- Code maintainability and performance
128+
- Approve the PR once it meets quality standards.
129+
3. Merging the PR
130+
- Only the assigned reviewer should merge the PR after approval.
131+
- The author should not merge their own PR unless explicitly allowed under specific circumstances (e.g. hotfixes with prior approval).
132+
133+
115134
## Generative Artificial Intelligence (AI) Usage Guidelines
116135

117136
To ensure transparency, maintain the quality and integrity of our codebase, we have the following expectations regarding the use of generative AI tools in contributions:

‎external/aot/build.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<property name="src" location="." />
1313

1414
<target name="prepare_base_image" depends="move_scripts,clean_image" description="prepare the base image">
15-
<echo message="Executing external.sh --prepare --dir ${TEST} --tag ${dockerImageTag} --version ${JDK_VERSION} --impl ${JDK_IMPL} --base_docker_registry_url 'docker.io' --base_docker_registry_dir 'default' --docker_args ${extra_docker_args} " />
15+
<echo message="Executing external.sh --prepare --dir ${TEST} --tag ${dockerImageTag} --version ${JDK_VERSION} --impl ${JDK_IMPL} --base_docker_registry_url 'icr.io' --base_docker_registry_dir 'default' --docker_args ${extra_docker_args} " />
1616
<exec executable="bash" failonerror="true">
1717
<arg value="${DEST_EXTERNAL}/external.sh"/>
1818
<arg value="--prepare"/>
@@ -25,7 +25,7 @@
2525
<arg value="--impl"/>
2626
<arg value="${JDK_IMPL}"/>
2727
<arg value="--base_docker_registry_url"/>
28-
<arg value="docker.io"/>
28+
<arg value="icr.io"/>
2929
<arg value="--base_docker_registry_dir"/>
3030
<arg value="default"/>
3131
<arg value="--docker_args"/>

‎external/criu-functional/build.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<property name="src" location="." />
1313

1414
<target name="prepare_base_image" depends="move_scripts,clean_image" description="prepare the base image">
15-
<echo message="Executing external.sh --prepare --dir ${TEST} --tag ${dockerImageTag} --version ${JDK_VERSION} --impl ${JDK_IMPL} --base_docker_registry_url 'docker.io' --base_docker_registry_dir 'default' --docker_args ${extra_docker_args} " />
15+
<echo message="Executing external.sh --prepare --dir ${TEST} --tag ${dockerImageTag} --version ${JDK_VERSION} --impl ${JDK_IMPL} --base_docker_registry_url 'icr.io' --base_docker_registry_dir 'default' --docker_args ${extra_docker_args} " />
1616
<exec executable="bash" failonerror="true">
1717
<arg value="${DEST_EXTERNAL}/external.sh"/>
1818
<arg value="--prepare"/>
@@ -25,7 +25,7 @@
2525
<arg value="--impl"/>
2626
<arg value="${JDK_IMPL}"/>
2727
<arg value="--base_docker_registry_url"/>
28-
<arg value="docker.io"/>
28+
<arg value="icr.io"/>
2929
<arg value="--base_docker_registry_dir"/>
3030
<arg value="default"/>
3131
<arg value="--docker_args"/>

‎openjdk/excludes/ProblemList_openjdk11-openj9.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,9 @@ sun/security/mscapi/SmallPrimeExponentP.java https://github.ibm.com/runtimes/bac
297297
sun/security/mscapi/VeryLongAlias.java https://github.ibm.com/runtimes/backlog/issues/795 windows-all
298298
sun/security/pkcs11/Provider/MultipleLogins.sh https://github.ibm.com/runtimes/backlog/issues/795 linux-all
299299
sun/security/pkcs11/Secmod/AddTrustedCert.java https://github.ibm.com/runtimes/backlog/issues/795 linux-all
300+
sun/security/pkcs12/KeytoolOpensslInteropTest.java https://github.com/eclipse-openj9/openj9/issues/21964 generic-all
300301
sun/security/pkcs12/KeytoolOpensslInteropTest.java#GenerateOpensslPKCS12 https://github.com/eclipse-openj9/openj9/issues/21964 generic-all
302+
sun/security/pkcs12/KeytoolOpensslInteropTest.java#UseExistingPKCS12 https://github.com/eclipse-openj9/openj9/issues/22262 z/OS-s390x
301303
sun/security/provider/SecureRandom/AbstractDrbg/SpecTest.java https://github.ibm.com/runtimes/backlog/issues/809 linux-aarch64
302304
sun/security/provider/SecureRandom/SHA1PRNGReseed.java https://github.ibm.com/runtimes/backlog/issues/809 linux-aarch64
303305
sun/security/provider/SecureRandom/StrongSecureRandom.java https://github.ibm.com/runtimes/backlog/issues/809 linux-aarch64

‎openjdk/excludes/ProblemList_openjdk11.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ sun/management/jmxremote/bootstrap/CustomLauncherTest.java https://github.com/ad
6969
javax/net/ssl/SSLEngine/LargePacket.java https://bugs.openjdk.org/browse/JDK-8227651 generic-all
7070
javax/net/ssl/ServerName/SSLEngineExplorerWithCli.java https://github.com/adoptium/aqa-tests/issues/2123 linux-all,macosx-all
7171
sun/security/ssl/SSLSocketImpl/SSLSocketLeak.java https://github.com/adoptium/aqa-tests/issues/3811 windows-x86
72+
sun/security/ssl/X509TrustManagerImpl/distrust/Symantec.java https://github.com/adoptium/aqa-tests/issues/5955 generic-all
7273

7374
############################################################################
7475

‎openjdk/excludes/ProblemList_openjdk17-openj9.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,9 @@ sun/security/mscapi/SmallPrimeExponentP.java https://github.ibm.com/runtimes/bac
337337
sun/security/mscapi/VeryLongAlias.java https://github.ibm.com/runtimes/backlog/issues/795 windows-all
338338
sun/security/pkcs11/Provider/MultipleLogins.sh https://github.ibm.com/runtimes/backlog/issues/795 linux-all
339339
sun/security/pkcs11/Secmod/AddTrustedCert.java https://github.ibm.com/runtimes/backlog/issues/795 linux-all
340+
sun/security/pkcs12/KeytoolOpensslInteropTest.java https://github.com/eclipse-openj9/openj9/issues/21964 generic-all
340341
sun/security/pkcs12/KeytoolOpensslInteropTest.java#GenerateOpensslPKCS12 https://github.com/eclipse-openj9/openj9/issues/21964 generic-all
342+
sun/security/pkcs12/KeytoolOpensslInteropTest.java#UseExistingPKCS12 https://github.com/eclipse-openj9/openj9/issues/22262 z/OS-s390x
341343
sun/security/provider/SecureRandom/AbstractDrbg/SpecTest.java https://github.ibm.com/runtimes/backlog/issues/809 linux-aarch64
342344
sun/security/provider/SecureRandom/StrongSecureRandom.java https://github.ibm.com/runtimes/backlog/issues/809 linux-aarch64
343345
sun/security/rsa/PrivateKeyEqualityTest.java https://github.ibm.com/runtimes/backlog/issues/795 macosx-all

‎openjdk/excludes/ProblemList_openjdk17.txt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,6 @@ javax/net/ssl/SSLEngine/LargePacket.java https://bugs.openjdk.org/browse/JDK-822
199199
sun/security/lib/cacerts/VerifyCACerts.java https://github.com/adoptium/aqa-tests/issues/4808 generic-all
200200
sun/security/pkcs11/Secmod/AddTrustedCert.java https://github.com/adoptium/aqa-tests/issues/2123 linux-all
201201
sun/security/provider/SecureRandom/AbstractDrbg/SpecTest.java https://github.com/adoptium/aqa-tests/issues/2123 linux-all
202-
sun/security/ssl/X509TrustManagerImpl/distrust/Symantec.java https://github.com/adoptium/aqa-tests/issues/2123 generic-all
203202
sun/security/ssl/SSLSocketImpl/SSLSocketLeak.java https://github.com/adoptium/aqa-tests/issues/3811 windows-x86
204203
sun/security/util/Debug/DebugOptions.java https://bugs.openjdk.org/browse/JDK-8339713 linux-arm
205204
sun/security/tools/jarsigner/TimestampCheck.java https://bugs.openjdk.org/browse/JDK-8352302 generic-all
@@ -492,8 +491,8 @@ runtime/os/TestTracePageSizes.java#with-G1 https://bugs.openjdk.org/browse/JDK-8
492491
runtime/os/TestTracePageSizes.java#with-Parallel https://bugs.openjdk.org/browse/JDK-8337555 linux-all
493492
runtime/os/TestTracePageSizes.java#with-Serial https://bugs.openjdk.org/browse/JDK-8337555 linux-all
494493
runtime/os/TestTracePageSizes.java#compiler-options https://bugs.openjdk.org/browse/JDK-8337555 linux-all
495-
runtime/ErrorHandling/MachCodeFramesInErrorFile.java https://bugs.openjdk.org/browse/JDK-8347908 linux-arm
496-
runtime/ErrorHandling/MachCodeFramesInErrorFile.java https://bugs.openjdk.org/browse/JDK-8313315 windows-aarch64
494+
# runtime/ErrorHandling/MachCodeFramesInErrorFile.java https://bugs.openjdk.org/browse/JDK-8313315 windows-aarch64
495+
runtime/ErrorHandling/MachCodeFramesInErrorFile.java https://bugs.openjdk.org/browse/JDK-8347908 linux-arm,windows-aarch64
497496
runtime/ErrorHandling/CreateCoredumpOnCrash.java https://bugs.openjdk.org/browse/JDK-8348862 windows-aarch64
498497

499498
############################################################################

‎openjdk/excludes/ProblemList_openjdk21-openj9.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,9 @@ sun/security/mscapi/SmallPrimeExponentP.java https://github.ibm.com/runtimes/bac
402402
sun/security/mscapi/VeryLongAlias.java https://github.ibm.com/runtimes/backlog/issues/795 windows-all
403403
sun/security/pkcs11/Provider/MultipleLogins.sh https://github.ibm.com/runtimes/backlog/issues/795 linux-all
404404
sun/security/pkcs11/Secmod/AddTrustedCert.java https://github.ibm.com/runtimes/backlog/issues/795 linux-all
405+
sun/security/pkcs12/KeytoolOpensslInteropTest.java https://github.com/eclipse-openj9/openj9/issues/21964 generic-all
405406
sun/security/pkcs12/KeytoolOpensslInteropTest.java#GenerateOpensslPKCS12 https://github.com/eclipse-openj9/openj9/issues/21964 generic-all
407+
sun/security/pkcs12/KeytoolOpensslInteropTest.java#UseExistingPKCS12 https://github.com/eclipse-openj9/openj9/issues/22262 z/OS-s390x
406408
sun/security/rsa/PrivateKeyEqualityTest.java https://github.ibm.com/runtimes/backlog/issues/795 macosx-all
407409
sun/security/rsa/pss/SignatureTest2.java https://github.ibm.com/runtimes/backlog/issues/795 macosx-all
408410
sun/security/rsa/pss/SignatureTestPSS.java https://github.ibm.com/runtimes/backlog/issues/795 macosx-all

0 commit comments

Comments
 (0)