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

Remove WebSocket support for Jetty 9 #7101

Merged
merged 2 commits into from
May 1, 2023
Merged

Conversation

jglick
Copy link
Member

@jglick jglick commented Sep 13, 2022

Cleans up after #6801. Retaining support temporarily for Jetty 9 seems like a sensible conservative decision but I do not think we wish to maintain this code indefinitely.

Proposed changelog entries

  • Remove support for WebSocket agents when running inside Jetty 9.

Proposed upgrade guidelines

If you are using WebSocket agents and were manually embedding Jenkins in a Jetty 9 servlet container, you should either upgrade the container to Jetty 10, or simply use the built-in container (java -jar jenkins.war).

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).

Copy link
Member

@basil basil left a comment

Choose a reason for hiding this comment

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

Seems a bit aggressive to me so long as current versions of JenkinsRule are still based on Jetty 9. org.csanchez.jenkins.plugins.kubernetes.pipeline.WebSocketTest seems likely to break.

@jglick
Copy link
Member Author

jglick commented Sep 13, 2022

True, this should wait for jenkinsci/jenkins-test-harness#453.

@jglick jglick closed this Sep 13, 2022
@jglick jglick deleted the jetty9 branch September 13, 2022 16:51
@basil
Copy link
Member

basil commented Sep 13, 2022

True, this should wait for jenkinsci/jenkins-test-harness#453.

I concur, and that in turn needs to wait for the test harness to require Java 11, which in turn needs to wait for the test harness to require a baseline of 2.357 or later. Since that baseline just came out in LTS form this month, I think it is a bit aggressive to start requiring it from the plugin POM and test infrastructure, but in a few more months (when more plugins have moved their baseline to 2.361.1 or later) the time could be right.

@jglick jglick reopened this Mar 22, 2023
@jglick
Copy link
Member Author

jglick commented Mar 22, 2023

Since jenkinsci/jenkins-test-harness#453 has long since been widely adopted, I believe this is now safe from a toolchain perspective.

Copy link
Member

@basil basil left a comment

Choose a reason for hiding this comment

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

Are all the plugins in BOM using a sufficiently new test harness with jenkinsci/jenkins-test-harness#453? If not, this might have to wait until jenkinsci/plugin-compat-tester#489.

@jglick
Copy link
Member Author

jglick commented Mar 22, 2023

I suspect it suffices for all plugins which test WebSocket agents to use the new harness. Can check an incremental build.

@jglick
Copy link
Member Author

jglick commented Mar 23, 2023

Indeed, bom passes against this change.

Copy link
Member

@NotMyFault NotMyFault left a comment

Choose a reason for hiding this comment

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

Thanks!

@NotMyFault NotMyFault added the removed This PR removes a feature or a public API label Apr 25, 2023
@NotMyFault
Copy link
Member

/label ready-for-merge


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

@comment-ops-bot comment-ops-bot bot added the ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback label Apr 25, 2023
@NotMyFault NotMyFault merged commit cac4d94 into jenkinsci:master May 1, 2023
@jglick jglick deleted the jetty9 branch May 1, 2023 18:07
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 removed This PR removes a feature or a public API
Projects
None yet
3 participants