Reformat tags for hotspot builds to ensure they match upstream tags

[adamfarley]

*_adopt tags don't match anything upstream, so I'm removing the "_adopt" bit when we're running a hotspot build.

Testing here: https://ci.adoptium.net/job/build-scripts/job/openjdk21-pipeline/177/

[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"

[adamfarley]

Ok, typo caused a failure. Fixed the typo, and then decided that we don't want to put this logic within the build itself. Tidier if we put it in the pipeline job.

Change made. Running test now: https://ci.adoptium.net/job/build-scripts/job/openjdk21-pipeline/178/

Update: Ok, this works. Adding to Slack to request reviews.

[andrew-m-leonard]

run tests

[andrew-m-leonard]

Looks fine I think. Assuming some build tests have been done

[eclipse-temurin-bot]

 PR TESTER RESULT 

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

[karianna]

Have pings the PMC on this one in case there's historical context

[gdams]

This won’t work, the whole reason for the _adopt tag is that it contains any Adoptium patches that have been merged from the dev branch into the release branch.

[andrew-m-leonard]

This won’t work, the whole reason for the _adopt tag is that it contains any Adoptium patches that have been merged from the dev branch into the release branch.

@gdams for some context, this is "hotspot" builds, not "temurin" builds, see:

ci-jenkins-pipelines/pipelines/jobs/configurations/jdk21.groovy

Line 24 in 8c0442b

'hotspot',

We do a sanity build of upstream "hotspot" for jdk-21, which fails as obviously upstream openjdk don't have an _adopt tag..
If we think we should just not build this, then that's an option too? @sxa

[gdams]

Ahh okay sorry that makes sense now.

[sxa]

What is the problem that's being fixed here? That's not clear from the description. Is there something specific that's failing?

[adamfarley]

Heya Stewart. The problem we're fixing here is that the tag-specific ea builds of jdk21 (example) are failing when building the hotspot (NOT Temurin) variant, because we're seeking a specific tagged level which IS present at Adoptium, but is NOT present when we clone directly from the upstream OpenJDK source repos.

In short, we need to remove the "_adopt" bit from hotspot-variant builds before they will work.

This change does that in a way that lets us continue to execute the hotspot builds with the same pipeline job as the Temurin builds.

[adamfarley]

Looks like we have no remaining objections. Will squash and merge.

[sxa]

Heya Stewart. The problem we're fixing here is that the tag-specific ea builds of jdk21 (example) are failing when building the hotspot (NOT Temurin) variant

Makes sense - thanks for clarifying.