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

Resolve testenv.properties "-ga" tags to the actual openjdk build tag for scm_ref check #967

Merged
merged 3 commits into from
Mar 13, 2024

Conversation

andrew-m-leonard
Copy link
Contributor

@andrew-m-leonard andrew-m-leonard commented Mar 13, 2024

testenv.properties branch tag contains a potential "-ga" or "-dryrun-ga" tag, eg: https://github.com/adoptium/aqa-tests/blob/2403f9f458a53d1b7c9d73c39606c5065ccbd798/testenv/testenv.properties#L20C14-L20C30

JDK22_BRANCH=jdk-22-dryrun-ga

In this case we need to resolve it to the actual upstream build tag, that is specified on the pipeline scm_ref.
Without this a release pipeline will fail like:

[ERROR] scmReference does not match with any JDK branch in testenv.properties in aqa-tests release branch. Please update aqa-tests v1.0.1-release release branch. Set the current build result to FAILURE!

Local tests with this PR:

[INFO] Resolved jdk-22-dryrun-ga to upstream build tag jdk-22+35
[INFO] Resolved jdk-11.0.22-ga to upstream build tag jdk-11.0.22+7
[INFO] Resolved jdk8u392-dryrun-ga to upstream build tag jdk8u392-b06

@andrew-m-leonard andrew-m-leonard self-assigned this Mar 13, 2024
Copy link

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"

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

A block has been put on this Pull Request as this repository is temporarily under a code freeze due to an ongoing release cycle.

If this pull request needs to be merged during the release cycle then please comment /merge and a PMC member will be able to remove the block.

If the code freeze is over you can remove this block by commenting /thaw.

Copy link
Member

@sxa sxa left a comment

Choose a reason for hiding this comment

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

I'm shuddering somewhat at the amount of extra code we're adding for this, but I'll approve based on the test results so we can get the dry run pipelines initiated (To be clear I have not done a full review of the code)

I would suggest we also describe the problem that this is solving in the start of the description i.e. what fails without this.

Copy link
Contributor

@adamfarley adamfarley left a comment

Choose a reason for hiding this comment

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

LGTM

@andrew-m-leonard
Copy link
Contributor Author

/merge

Copy link

Approval to merge during the lockdown cycle

Please can two Adoptium PMC members comment /approve?

@smlambert
Copy link
Contributor

/approve

1 similar comment
@andrew-m-leonard
Copy link
Contributor Author

/approve

@github-actions github-actions bot dismissed their stale review March 13, 2024 13:32

Thank you @smlambert and @andrew-m-leonard for your approvals, this pull request is now approved to merge during release.

@andrew-m-leonard andrew-m-leonard merged commit 3d1bdd3 into adoptium:master Mar 13, 2024
6 checks passed
andrew-m-leonard added a commit to andrew-m-leonard/ci-jenkins-pipelines that referenced this pull request Mar 13, 2024
… for scm_ref check (adoptium#967)

* Update release testenv jdkBranch check to resolve -ga commit

Signed-off-by: Andrew Leonard <[email protected]>

* Update release testenv jdkBranch check to resolve -ga commit

Signed-off-by: Andrew Leonard <[email protected]>

* Update release testenv jdkBranch check to resolve -ga commit

Signed-off-by: Andrew Leonard <[email protected]>

---------

Signed-off-by: Andrew Leonard <[email protected]>
andrew-m-leonard added a commit that referenced this pull request Mar 13, 2024
… for scm_ref check (#967) (#968)

* Update release testenv jdkBranch check to resolve -ga commit



* Update release testenv jdkBranch check to resolve -ga commit



* Update release testenv jdkBranch check to resolve -ga commit



---------

Signed-off-by: Andrew Leonard <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants