Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use jtreg6.1 for JDK11/17 on z/OS #645

Merged
merged 2 commits into from
Dec 3, 2024
Merged

Conversation

psoujany
Copy link
Contributor

@psoujany psoujany commented Dec 2, 2024

This PR to make JDK11 and JDK17 openjdk tests to use jtreg6.1 on z/OS. jtreg7.* has encoding issues on z/OS which led to Malformed Input Error with JDK11 and JDK17 on z/OS.

@psoujany
Copy link
Contributor Author

psoujany commented Dec 2, 2024

Verified the changes on JDK11 and JDK17 z/OS and multi-platform

JDK11 non-z/OS

getJtregVersion:
15:56:39       [echo] jtreg version used is : jtreg_7_3_1_1

Grinder_CR/27446

JDK11 on z/OS

getJtregVersion:
16:23:46       [echo] jtreg version used is : jtreg_6_1

Grinder_CR/27464

JDK17 on non-z/OS

getJtregVersion:
16:31:42       [echo] jtreg version used is : jtreg_7_3_1_1

Grinder_CR/27466/

JDK17 on z/OS

getJtregVersion:
16:32:30       [echo] jtreg version used is : jtreg_6_1

Grinder_CR/27467

@psoujany
Copy link
Contributor Author

psoujany commented Dec 2, 2024

@llxia Could you please review these changes. Thank you.

<if>
<!-- versions 8-10, 12-16 -->
<matches pattern="^([89]|1[02-6])$" string="${JDK_VERSION}"/>
<then>
<property name="jtregTar" value="jtreg_5_1_b01"/>
</then>
<elseif>
<!-- versions 11, 17 on z/OS -->
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please add the reason for using jtreg 6.1 for zOS and related issue in the comment?

Copy link
Contributor Author

@psoujany psoujany Dec 3, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've added justification for the change. Could you please review. Thank you.

@karianna karianna requested a review from llxia December 3, 2024 07:03
Copy link
Contributor

@llxia llxia left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@llxia llxia merged commit df8c009 into adoptium:master Dec 3, 2024
3 checks passed
@llxia
Copy link
Contributor

llxia commented Dec 3, 2024

@keithc-ca
Copy link
Contributor

Testing now just fails:

        Error: The testsuite at /home/jenkins/workspace/Test_openjdk17_ibm_sanity.openjdk_s390x_zos_Personal_testList_0/aqa-tests/openjdk/openjdk-jdk/test/jdk requires jtreg version 7.3.1 b1 or higher and this is jtreg version 6-dev+1.

Please help me understand how trying to use 6.1 on z/OS make sense.

@psoujany
Copy link
Contributor Author

psoujany commented Dec 4, 2024

@keithc-ca This error is coming from JDK repos of 11 and 17. We've raised PRs there to use jtreg6.1. Once, these PRs are merged auto jobs should execute fine.
11 - openj9-openjdk-jdk11-zos/pull/2179
17 - openj9-openjdk-jdk17-zos/pull/1077

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants