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

Upgrade Surefire from 2.22.2 to 3.0.0-M7 #6652

Merged
merged 2 commits into from
Jun 12, 2022
Merged

Conversation

basil
Copy link
Member

@basil basil commented Jun 11, 2022

This PR upgrades Surefire from 2.22.2 to 3.0.0-M7, which is the latest version available when you visit https://maven.apache.org/surefire/maven-surefire-plugin/ and the same version used in our plugin POM and all other core components. See the release notes. Some details about this upgrade:

  • 3.0.0-M1 is susceptible to SUREFIRE-1593 and is therefore unsuitable.
  • Starting with 3.0.0-M4, the baseline JVM memory requirement for Surefire for the main Maven process (not the forked Surefire JVM used for running the tests) appears to have increased by about 300 MB, a requirement which continues up until 3.0.0-M7.
  • 3.0.0-M6 is susceptible to SUREFIRE-2076 and is therefore unsuitable.

The current PR upgrades us to 3.0.0-M7 by deleting the custom downgrade, therefore getting version 3.0.0-M7 from our parent POM like all other core components. I have tested the 3.0.0-M7 upgrade in a variety of memory configurations:

  • With the current 800 MB heap, which consistently fails with out of memory errors.
  • With a 1 GB heap, which also consistently fails with out of memory errors.
  • With 1100, 1256, 1396, and 1536 MB heaps, with which I have not seen a single out of memory error and all of which I have tested at least twice so far.

This PR selects a 1100 MB heap (a 38% increase) for the Maven process, which I have tested twice without seeing a single out of memory error (the PR builds from this PR will serve as additional testing).

Proposed changelog entries

N/A

Proposed upgrade guidelines

N/A

Submitter checklist

  • (If applicable) Jira issue is well described
  • Changelog entries and upgrade guidelines are appropriate for the audience affected by the change (users or developer, depending on the change) and are in the imperative mood. Examples
    • Fill-in the Proposed changelog entries section only if there are breaking changes or other changes which may require extra steps from users during the upgrade
  • Appropriate autotests or explanation to why this change has no tests
  • New public classes, fields, and methods are annotated with @Restricted or have @since TODO Javadoc, as appropriate.
  • For dependency updates: links to external changelogs and, if possible, full diffs

Desired reviewers

@mention

Maintainer checklist

Before the changes are marked as ready-for-merge:

  • There are at least 2 approvals for the pull request and no outstanding requests for change
  • Conversations in the pull request are over OR it is explicit that a reviewer does not block the change
  • Changelog entries in the PR title and/or Proposed changelog entries are accurate, human-readable, and in the imperative mood
  • Proper changelog labels are set so that the changelog can be generated automatically
  • If the change needs additional upgrade steps from users, upgrade-guide-needed label is set and there is a Proposed upgrade guidelines section in the PR title. (example)
  • If it would make sense to backport the change to LTS, a Jira issue must exist, be a Bug or Improvement, and be labeled as lts-candidate to be considered (see query).

@basil basil added the skip-changelog Should not be shown in the changelog label Jun 11, 2022
@basil basil added the squash-merge-me Unclean or useless commit history, should be merged only with squash-merge label Jun 11, 2022
Copy link
Member

@oleg-nenashev oleg-nenashev left a comment

Choose a reason for hiding this comment

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

Fine with me

@basil
Copy link
Member Author

basil commented Jun 11, 2022

This PR is now ready for merge. We will merge it after approximately 24 hours if there is no negative feedback. Please see the merge process documentation for more information about the merge process. Thanks!

@basil basil added the ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback label Jun 11, 2022
@basil basil merged commit 56a03a5 into jenkinsci:master Jun 12, 2022
@basil basil deleted the surefire3-m7 branch June 12, 2022 23:55
@daniel-beck
Copy link
Member

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback skip-changelog Should not be shown in the changelog squash-merge-me Unclean or useless commit history, should be merged only with squash-merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants