Skip to content

Conversation

@jerboaa
Copy link
Contributor

@jerboaa jerboaa commented Sep 6, 2023

Simple GHA only change to add cacert tests to the tier1 test set. Please review.

Testing:


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8315757 needs maintainer approval

Issue

  • JDK-8315757: [8u] Add cacerts JTREG tests to GHA tier1 test set (Bug - P3 - Approved)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk8u-dev.git pull/368/head:pull/368
$ git checkout pull/368

Update a local copy of the PR:
$ git checkout pull/368
$ git pull https://git.openjdk.org/jdk8u-dev.git pull/368/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 368

View PR using the GUI difftool:
$ git pr show -t 368

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk8u-dev/pull/368.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 6, 2023

👋 Welcome back sgehwolf! A progress list of the required criteria for merging this PR into pr/365 will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@jerboaa jerboaa marked this pull request as ready for review September 6, 2023 14:48
@openjdk openjdk bot added the rfr Pull request is ready for review label Sep 6, 2023
@mlbridge
Copy link

mlbridge bot commented Sep 6, 2023

Webrevs

Copy link
Member

@phohensee phohensee left a comment

Choose a reason for hiding this comment

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

This seems to include the changes from #365. Maybe forgot to derive your 8315757 branch from your 8309088 branch?

@jerboaa jerboaa force-pushed the JDK-8315757-tier1-gha branch from c3f5e1d to 8a78c6a Compare September 8, 2023 09:15
@openjdk
Copy link

openjdk bot commented Sep 8, 2023

@jerboaa Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

@jerboaa
Copy link
Contributor Author

jerboaa commented Sep 8, 2023

This seems to include the changes from #365. Maybe forgot to derive your 8315757 branch from your 8309088 branch?

It's an oddity of dependent pull requests. As soon as one of the PRs you depend on integrate, you need to rebase to the actually committed/rebased version in all dependants. Should be fixed now.

Copy link
Member

@phohensee phohensee left a comment

Choose a reason for hiding this comment

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

Fixed. :)

Copy link
Member

@gnu-andrew gnu-andrew left a comment

Choose a reason for hiding this comment

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

There's already a jdk_security_infra so should we not reuse that, either adding cacerts to it or including it in jdk_cacerts?

Also, why is this not being proposed to trunk first?

@gnu-andrew
Copy link
Member

On the positive side, the checks show it is working :)

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/365 to master September 11, 2023 08:21
@openjdk-notifier
Copy link

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout JDK-8315757-tier1-gha
git fetch https://git.openjdk.org/jdk8u-dev.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk
Copy link

openjdk bot commented Sep 11, 2023

@jerboaa This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8315757: [8u] Add cacerts JTREG tests to GHA tier1 test set

Reviewed-by: phh, andrew

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Sep 11, 2023
@jerboaa jerboaa force-pushed the JDK-8315757-tier1-gha branch from 8a78c6a to f66b60c Compare September 11, 2023 08:39
@openjdk
Copy link

openjdk bot commented Sep 11, 2023

@jerboaa Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

@jerboaa
Copy link
Contributor Author

jerboaa commented Sep 11, 2023

There's already a jdk_security_infra so should we not reuse that, either adding cacerts to it or including it in jdk_cacerts?

Good catch. I've added it to jdk_security_infra.

Also, why is this not being proposed to trunk first?

VerifyCACerts.java is part of tier2 in JDK head by means of jdk_security => jdk_security_3 => sun/security. jdk_security_infra is not part of any group yet, which I assume has a reason. Probably, because those tests depend on what CAs do (external factors?). The situation in 8u is a bit different to later JDKs, IMO. It's more like GHA being the best option for the early heads-up in 8u as later tiers aren't being run publicly. I have no strong opinion about this, but I lack the relevant cycles in order to push this upstream at this point. Feel free to go ahead and propose it though.

@gnu-andrew
Copy link
Member

There's already a jdk_security_infra so should we not reuse that, either adding cacerts to it or including it in jdk_cacerts?

Good catch. I've added it to jdk_security_infra.

It looks like it was added by JDK-8189131 but that didn't add it to any tier. It does seem worth investigating if this was just an oversight or intentional.

Also, why is this not being proposed to trunk first?

VerifyCACerts.java is part of tier2 in JDK head by means of jdk_security => jdk_security_3 => sun/security. jdk_security_infra is not part of any group yet, which I assume has a reason. Probably, because those tests depend on what CAs do (external factors?). The situation in 8u is a bit different to later JDKs, IMO. It's more like GHA being the best option for the early heads-up in 8u as later tiers aren't being run publicly. I have no strong opinion about this, but I lack the relevant cycles in order to push this upstream at this point. Feel free to go ahead and propose it though.

Ah ok, I hadn't realised 8u was running a smaller test set than later JDKs. I'm guessing later tiers don't pass? Given the cacerts part is a 8u-only omission, I'm happy for this to go in as is.

I think the infra story is worth pursuing upstream. I've no issue with adding them like this to 8u for now, under this ticket, so we have tests running in some form. However, we may need to adjust further, depending on the decision upstream.

Do you know if the GHA tests will now pass? If not, is there a PR waiting that will make that happen? I'm happy to push this once GHA passes.

@jerboaa
Copy link
Contributor Author

jerboaa commented Sep 11, 2023

Do you know if the GHA tests will now pass? If not, is there a PR waiting that will make that happen? I'm happy to push this once GHA passes.

It should pass once jdk8u merges with jdk8u-dev as we need JDK-8295894 in jdk8u-dev for this to be clean.

@gnu-andrew
Copy link
Member

Do you know if the GHA tests will now pass? If not, is there a PR waiting that will make that happen? I'm happy to push this once GHA passes.

It should pass once jdk8u merges with jdk8u-dev as we need JDK-8295894 in jdk8u-dev for this to be clean.

Ok that one's on me then. I'll get that merged and then you can merge this PR with the merged 8u-dev HEAD and run the tests.

@gnu-andrew
Copy link
Member

gnu-andrew commented Sep 20, 2023

8u392-b06 now merged back into 8u-dev (#375), so merging this with HEAD should re-run the tests with JDK-8295894.

@jerboaa
Copy link
Contributor Author

jerboaa commented Sep 21, 2023

Done. Lets see how it goes.

EDIT: Good times. Looks like by now one of the GoogleCA certs have been revoked:

 TEST: security/infra/java/security/cert/CertPathValidator/certification/GoogleCA.java
[...]
java.lang.RuntimeException: TEST FAILED: unexpected status of EE certificate
	at ValidatePathWithParams.validate(ValidatePathWithParams.java:193)
	at GoogleGSR4.runTest(GoogleCA.java:155)
	at GoogleCA.main(GoogleCA.java:53)
	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
	at java.lang.reflect.Method.invoke(Method.java:498)
	at com.sun.javatest.regtest.agent.MainWrapper$MainThread.run(MainWrapper.java:127)
	at java.lang.Thread.run(Thread.java:750)

@gnu-andrew
Copy link
Member

Looks like this is JDK-8316215 and the solution seems to be to change the approach to this testing altogether; see JDK-8308592

@gnu-andrew
Copy link
Member

I've started the backporting of that change with 17u: openjdk/jdk17u-dev#1805 Once it's in 8u, this should pass (fingers crossed)

@openjdk
Copy link

openjdk bot commented Oct 2, 2023

⚠️ @jerboaa This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Oct 2, 2023
@openjdk openjdk bot reopened this Nov 28, 2023
@openjdk
Copy link

openjdk bot commented Nov 28, 2023

@jerboaa This pull request is now open

@jerboaa
Copy link
Contributor Author

jerboaa commented Nov 28, 2023

This could work again once #390 is in. Waiting for that to happen first.

@gnu-andrew
Copy link
Member

All tests pass now with #390, so if you make this PR depend on that, it should now pass.

@jerboaa jerboaa force-pushed the JDK-8315757-tier1-gha branch from 3bcf7e2 to e0584c3 Compare November 28, 2023 16:27
@jerboaa jerboaa changed the base branch from master to pr/390 November 28, 2023 16:27
@openjdk
Copy link

openjdk bot commented Nov 28, 2023

@jerboaa Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

@jerboaa
Copy link
Contributor Author

jerboaa commented Nov 28, 2023

All tests pass now with #390, so if you make this PR depend on that, it should now pass.

Done. Let's see how it goes in terms of GHA.

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/390 to master December 2, 2023 00:39
@openjdk-notifier
Copy link

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout JDK-8315757-tier1-gha
git fetch https://git.openjdk.org/jdk8u-dev.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@jerboaa jerboaa force-pushed the JDK-8315757-tier1-gha branch from e0584c3 to 411458a Compare December 4, 2023 11:01
@openjdk
Copy link

openjdk bot commented Dec 4, 2023

@jerboaa Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

@jerboaa
Copy link
Contributor Author

jerboaa commented Dec 4, 2023

/approval request Please approve getting this 8u-specific test-only change in. It helps verify cacert issues. Risk is low, as it's a test only change. Should there be stability issues, tests could get problem-listed or disabled. GHA testing shows that those tests pass.

@openjdk
Copy link

openjdk bot commented Dec 4, 2023

@jerboaa
8315757: The approval request has been created successfully.

@openjdk openjdk bot added the approval Requires approval; will be removed when approval is received label Dec 4, 2023
Copy link
Member

@gnu-andrew gnu-andrew left a comment

Choose a reason for hiding this comment

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

jdk tests finally passing (for the time being!)

@gnu-andrew
Copy link
Member

/approve yes

@openjdk
Copy link

openjdk bot commented Dec 5, 2023

@gnu-andrew
8315757: The approval request has been approved.

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval Requires approval; will be removed when approval is received labels Dec 5, 2023
@jerboaa
Copy link
Contributor Author

jerboaa commented Dec 5, 2023

Thanks for the review and approval!

/integrate

@openjdk
Copy link

openjdk bot commented Dec 5, 2023

Going to push as commit 74a3ddd.

@openjdk openjdk bot added the integrated Pull request has been integrated label Dec 5, 2023
@openjdk openjdk bot closed this Dec 5, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 5, 2023
@openjdk
Copy link

openjdk bot commented Dec 5, 2023

@jerboaa Pushed as commit 74a3ddd.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@jerboaa jerboaa mentioned this pull request Dec 5, 2023
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

3 participants