jtreg.sh - use jdk11 instead of jdk-11

[sxa]

The dependencyPipeline job has been failing since November e.g. https://ci.adoptium.net/job/dependency_pipeline/1464/execution/node/161/log/?consoleFull

***********************************************
Building JTREG jtreg-7+1...
***********************************************
PATH: /usr/lib/jvm/jdk-11/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
JAVA_HOME: /usr/lib/jvm/jdk-11
Changing into /home/adoptopenjdk/workspace/dependency_pipeline/jtreg
Currently in /home/adoptopenjdk/workspace/dependency_pipeline/jtreg
Removing contents of build folder
[build.sh][INFO] CYGWIN_OR_MSYS=0
[build.sh][ERROR] '/usr/lib/jvm/jdk-11' is not a directory

This has resulted in the PR to update to jtreg 7.1+1 to fail to go live.
The underlying reason for this appears to be because that job is utilising the adoptium build_image docker containers (which I wasn't aware of) and they were changed to use jdkXX instead of jdk-XX for the name of the JDK directory under /usr/lib/jvm for better compatibility with the upstream openjdk builds.

This PR adjusts the jtreg.sh script so that it uses the jdkXX paths without the hyphen.

Temporary test job with the fix: https://ci.adoptium.net/job/sxa-deppipe/1/execution/node/148/log/

[github-actions]

Thank you for creating a pull request!

Please check out the information below if you have not made a pull request here before (or if you need a reminder how things work).

Code Quality and Contributing Guidelines

If you have not done so already, please familiarise yourself with our Contributing Guidelines and Code Of Conduct, even if you have contributed before.

Tests

Github actions will run a set of jobs against your PR that will lint and unit test your changes. Keep an eye out for the results from these on the latest commit you submitted. For more information, please see our testing documentation.

In order to run the advanced pipeline tests (executing a set of mock pipelines), it requires an admin to post run tests on this PR.
If you are not an admin, please ask for one's attention in #infrastructure on Slack or ping one here.
To run full set of tests, use "run tests"; a subset of tests on specific jdk version, use "run tests quick 11,21"

[sxa]

run tests 8,21

[keithc-ca]

This has resulted in the PR to update to jtreg 5.1+1 to fail to go live.

nit, that PR was to add jtreg 7.5+1 to the set of available versions.

[sxa]

This has resulted in the PR to update to jtreg 5.1+1 to fail to go live.

nit, that PR was to add jtreg 7.5+1 to the set of available versions.

Fixed

[sxa]

I've pushed another commit to fix a similar failure in the temurin-sbom phase of the dependency job too.
https://ci.adoptium.net/job/sxa-deppipe/1 is running with that extra commit and passed that phase successfully.

[keithc-ca]

This should fix #1190.

[eclipse-temurin-bot]

 PR TESTER RESULT 

❎ Some pipelines failed or the job was aborted! ❎
See the pipeline-build-check below for more information...

[sxa]

run tests

[eclipse-temurin-bot]

 PR TESTER RESULT 

❎ Some pipelines failed or the job was aborted! ❎
See the pipeline-build-check below for more information...

[keithc-ca]

The failure on Windows appears unrelated to this change. Could that job be restarted, perhaps?

[sxa]

The failure on Windows appears unrelated to this change. Could that job be restarted, perhaps?

Yeah that was a machine-specific issue with a locked directory so I am unconcerned about it.

Re-running at https://ci.adoptium.net/job/build-scripts-pr-tester/job/build-test/job/jobs/job/jdk8u/job/jdk8u-windows-x64-temurin/220/console although that won't show up in the checks. Still requires another formal reviewer so assigning Andrew as a reviewer.

[karianna]

The failure on Windows appears unrelated to this change. Could that job be restarted, perhaps?

Yeah that was a machine-specific issue with a locked directory so I am unconcerned about it.

Re-running at https://ci.adoptium.net/job/build-scripts-pr-tester/job/build-test/job/jobs/job/jdk8u/job/jdk8u-windows-x64-temurin/220/console although that won't show up in the checks. Still requires another formal reviewer so assigning Andrew as a reviewer.

Rerun was good, merging.

[sxa]

https://ci.adoptium.net/job/dependency_pipeline/1474/ is green (First in a long time!)