Skip to content

Conversation

@amosshi
Copy link
Contributor

@amosshi amosshi commented Dec 15, 2023

Backport of JDK-8294402

Clean vs Unclean Backport

  • Unclean Backport because we have manually edited the file test/jtreg-ext/requires/VMProps.java
    • The Copyright year line are conflicting. Manually merged.
    • log("Entering dockerSupport()") base line are different. Manually merged.
    • This file can be considered as Clean backport
  • Well the system added the clean label

Tests

  • PR: All checks have passed
  • SAP nightlies passed on 2023-12-19

Progress

  • JDK-8294402 needs maintainer approval
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8294402: Add diagnostic logging to VMProps.checkDockerSupport (Enhancement - P3 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2390

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 15, 2023

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

@openjdk openjdk bot changed the title Backport 03d613bbab99dd84dfc5115a5034c60f4e510259 8294402: Add diagnostic logging to VMProps.checkDockerSupport Dec 15, 2023
@openjdk
Copy link

openjdk bot commented Dec 15, 2023

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required labels Dec 15, 2023
@openjdk
Copy link

openjdk bot commented Dec 15, 2023

⚠️ @amosshi 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 added the rfr Pull request is ready for review label Dec 15, 2023
@mlbridge
Copy link

mlbridge bot commented Dec 15, 2023

Webrevs

@amosshi
Copy link
Contributor Author

amosshi commented Dec 18, 2023

/approval request “Backporting for parity with jdk 11.0.23-oracle. No risk, test fix. Clean backport. SAP nightlies passed on 2023-12-19”

@openjdk
Copy link

openjdk bot commented Dec 18, 2023

@amosshi
8294402: The approval request has been created successfully.

@openjdk openjdk bot added approval Requires approval; will be removed when approval is received and removed approval Requires approval; will be removed when approval is received labels Dec 18, 2023
@openjdk openjdk bot added the approval Requires approval; will be removed when approval is received label Jan 5, 2024
@openjdk
Copy link

openjdk bot commented Jan 6, 2024

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

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

8294402: Add diagnostic logging to VMProps.checkDockerSupport

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 104 new commits pushed to the master branch:

  • 9a16bee: 8310551: vmTestbase/nsk/jdb/interrupt/interrupt001/interrupt001.java timed out due to missing prompt
  • ed37e2d: 8208243: vmTestbase/gc/lock/jni/jnilock002/TestDescription.java fails in jdk/hs nightly
  • e3b6c50: 8311585: Add JRadioButtonMenuItem to bug8031573.java
  • 78ca5ec: 8202931: [macos] java/awt/Choice/ChoicePopupLocation/ChoicePopupLocation.java fails
  • 888837a: 8315042: NPE in PKCS7.parseOldSignedData
  • 93d1dc7: 8315499: build using devkit on Linux ppc64le RHEL puts path to devkit into libsplashscreen
  • 2a96f76: 8271829: mark hotspot runtime/Throwable tests which ignore external VM flags
  • 5fc2f4c: 8271828: mark hotspot runtime/classFileParserBug tests which ignore external VM flags
  • b29ef19: 8271890: mark hotspot runtime/Dictionary tests which ignore external VM flags
  • cf74d9d: 8058176: [mlvm] tests should not allow code cache exhaustion
  • ... and 94 more: https://git.openjdk.org/jdk11u-dev/compare/e793bdd174ad976f567d0d911db42f67f6d7e59d...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@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 Jan 6, 2024
@amosshi
Copy link
Contributor Author

amosshi commented Jan 8, 2024

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jan 8, 2024
@openjdk
Copy link

openjdk bot commented Jan 8, 2024

@amosshi
Your change (at version e9670e4) is now ready to be sponsored by a Committer.

@GoeLin
Copy link
Member

GoeLin commented Jan 8, 2024

/sponsor

@openjdk
Copy link

openjdk bot commented Jan 8, 2024

Going to push as commit de6ccb9.
Since your change was applied there have been 108 commits pushed to the master branch:

  • f6ddc4b: 8296083: javax/swing/JTree/6263446/bug6263446.java fails intermittently on a VM
  • 94bf6db: 8202790: DnD test DisposeFrameOnDragTest.java does not clean up
  • 8ca3b77: 8322417: Console read line with zero out should zero out when throwing exception
  • 4031a88: 8239801: [macos] java/awt/Focus/UnaccessibleChoice/AccessibleChoiceTest.java fails
  • 9a16bee: 8310551: vmTestbase/nsk/jdb/interrupt/interrupt001/interrupt001.java timed out due to missing prompt
  • ed37e2d: 8208243: vmTestbase/gc/lock/jni/jnilock002/TestDescription.java fails in jdk/hs nightly
  • e3b6c50: 8311585: Add JRadioButtonMenuItem to bug8031573.java
  • 78ca5ec: 8202931: [macos] java/awt/Choice/ChoicePopupLocation/ChoicePopupLocation.java fails
  • 888837a: 8315042: NPE in PKCS7.parseOldSignedData
  • 93d1dc7: 8315499: build using devkit on Linux ppc64le RHEL puts path to devkit into libsplashscreen
  • ... and 98 more: https://git.openjdk.org/jdk11u-dev/compare/e793bdd174ad976f567d0d911db42f67f6d7e59d...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jan 8, 2024
@openjdk openjdk bot closed this Jan 8, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Jan 8, 2024
@openjdk
Copy link

openjdk bot commented Jan 8, 2024

@GoeLin @amosshi Pushed as commit de6ccb9.

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

@amosshi amosshi deleted the backport-8294402 branch January 8, 2024 20:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants