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

Add 2.462.x release line, remove 2.426.x #3374

Merged
merged 16 commits into from
Jul 25, 2024

Conversation

MarkEWaite
Copy link
Contributor

Add 2.462.x line, remove 2.426.x line

  • Add 2.462.x release line
  • Remove 2.426.x line
  • Replace 2.426 with 2.440 in documentation
  • Use 2.452.3 instead of 2.452.1 as 2.452.x Jenkins version
  • Document the final 2.426.x BOM version

Fixes #3301

Testing done

Confirmed that mvn clean verify and PLUGINS=structs,mailer TEST=InjectedTest bash local-test.sh pass locally.

Submitter checklist

  • Make sure you are opening from a topic/feature/bugfix branch (right side) and not your main branch!
  • Ensure that the pull request title represents the desired changelog entry
  • Please describe what you did
  • Link to relevant issues in GitHub or Jira
  • Link to relevant pull requests, esp. upstream and downstream changes
  • Ensure you have provided tests - that demonstrates feature works or fixes the issue

@MarkEWaite MarkEWaite added the full-test Test all LTS lines in this PR and do not halt upon first error. label Jul 13, 2024
@MarkEWaite MarkEWaite requested a review from a team as a code owner July 13, 2024 11:54
Copy link
Member

@jglick jglick left a comment

Choose a reason for hiding this comment

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

Did you forget to update

<artifactId>bom-weekly</artifactId>
?

Thanks to @jglick for detecting that mistake.  Reported as
jenkinsci#3374 (review)
@MarkEWaite
Copy link
Contributor Author

Did you forget to update

<artifactId>bom-weekly</artifactId>

?

Thanks very much for catching that mistake! Corrected as 99a27d3

@jglick
Copy link
Member

jglick commented Jul 18, 2024

Passing now @MarkEWaite; did you plan to merge & release?

@MarkEWaite
Copy link
Contributor Author

MarkEWaite commented Jul 18, 2024

Passing now @MarkEWaite; did you plan to merge & release?

Thanks for asking. I thought that we'd run the weekly release tomorrow without this change and then merge it and release it at the end of next week. The first release candidate of 2.462.1 will be available Wednesday then the first BOM release with the 2.462.x profile will be available on Friday or Saturday.

Let me know if there is a specific benefit to merging sooner. I'm happy to merge sooner, but didn't want to drop the 2.426.x line until after the 2.462.1 RC was available.

@MarkEWaite
Copy link
Contributor Author

I'm intentionally leaving the conflict in this pull request until the next time that I want to perform a full test of the latest changes on the master branch.

Easier for me to find those old versions in the README rather than
searching the releases list for comments that tell me when a line was
dropped.
@MarkEWaite
Copy link
Contributor Author

MarkEWaite commented Jul 25, 2024

I'm intentionally leaving the conflict in this pull request until the next time that I want to perform a full test of the latest changes on the master branch.

I've resolved the conflict to test the merge of the ssh-credentials 342.x release that arrived in:

Full test has started and should confirm that change is passing tests. Before submitting the most recent change, I confirmed passing results for:

$ mvn clean verify
$ PLUGINS=ssh-credentials TEST=InjectedTest bash local-test.sh

Once full tests pass, I plan to merge this.

Tests failed due to a test dependency issue exposed by ssh-credentials update to most recent parent pom and the inclusion of an updated trilead API optional dependency. After reverting ssh-credentials, was able to try again.

@MarkEWaite MarkEWaite enabled auto-merge (squash) July 25, 2024 15:12
@MarkEWaite MarkEWaite merged commit 8e82f35 into jenkinsci:master Jul 25, 2024
725 checks passed
@MarkEWaite MarkEWaite deleted the add-2.462.x branch August 8, 2024 21:26
@NotMyFault NotMyFault mentioned this pull request Aug 14, 2024
38 tasks
@krisstern krisstern mentioned this pull request Sep 8, 2024
45 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
breaking full-test Test all LTS lines in this PR and do not halt upon first error.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Retire 2.426.x line
3 participants