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

[JENKINS-63958] use new winstone 5.11.1 with downgraded Jetty version 9.4.30.v20200611 #5019

Merged
merged 1 commit into from Oct 20, 2020

Conversation

olamy
Copy link
Member

@olamy olamy commented Oct 20, 2020

Signed-off-by: olivier lamy olamy@apache.org

See JENKINS-63958.

Proposed changelog entries

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

…1 because of JENKINS-63958

Signed-off-by: olivier lamy <olamy@apache.org>
@olamy olamy added bug For changelog: Minor bug. Will be listed after features dependencies Pull requests that update a dependency file labels Oct 20, 2020
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.

I prefer to integrate this PR if the build passes

@oleg-nenashev oleg-nenashev added major-bug For changelog: Major bug. Will be highlighted on the top of the changelog regression-fix Pull request that fixes a regression in one of the previous Jenkins releases and removed bug For changelog: Minor bug. Will be listed after features labels Oct 20, 2020
@oleg-nenashev oleg-nenashev requested review from timja and a team October 20, 2020 07:28
@res0nance
Copy link
Contributor

Favouring this over #5017

@oleg-nenashev oleg-nenashev added the ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback label Oct 20, 2020
@oleg-nenashev
Copy link
Member

I plan to merge it once the CI passes

@oleg-nenashev
Copy link
Member

Winstone 5.11.1 changelogs have been published: Downgrade Jetty to 9.4.30.v20200611 to fix the regression with wrong port added to URLs . We are all set here IMHO

@oleg-nenashev
Copy link
Member

oleg-nenashev commented Oct 20, 2020

Looks like the PR description modification has retriggered CI... 🤦 this glitch again. Or maybe it was a master branch change which is more likely

image

@oleg-nenashev
Copy link
Member

As discussed in the chat with @timja , will go ahead and merge it without waiting for the JDK8 CI. The release flow runs the same CI anyway.

image

@oleg-nenashev oleg-nenashev merged commit dfa4a6f into jenkinsci:master Oct 20, 2020
@jglick
Copy link
Member

jglick commented Oct 20, 2020

Picking up jenkinsci/winstone#125, fine.

@jglick
Copy link
Member

jglick commented Oct 20, 2020

If the bug with the port was reproducible somehow, has anyone attempted to cover this with an HtmlUnit regression test?

@Mike4Online
Copy link

My Jenkins 2.261 system now shows Jenkins 2.263 as an available upgrade, but automatic upgrade fails with the following:

Upgrade to Jenkins 2.263 failed: Failed to download from https://updates.jenkins.io/download/war/2.263/jenkins.war (redirected to: https://get.jenkins.io/war/2.263/jenkins.war).

Browsing to the above URL shows that the 2.263 sub-folder is not present.

@jglick
Copy link
Member

jglick commented Oct 20, 2020

$ curl -IL https://updates.jenkins.io/download/war/2.263/jenkins.war
HTTP/1.1 302 Found
Date: Tue, 20 Oct 2020 16:41:23 GMT
Server: Apache/2.4.29 (Ubuntu)
Location: https://get.jenkins.io/war/2.263/jenkins.war
Content-Type: text/html; charset=iso-8859-1

HTTP/2 404 
server: nginx/1.19.1
date: Tue, 20 Oct 2020 16:41:23 GMT
content-type: text/plain; charset=utf-8
content-length: 10
x-content-type-options: nosniff
strict-transport-security: max-age=15724800; includeSubDomains

Might correct itself after something finishes uploading, TBD.

@Mike4Online
Copy link

Still not working. I opened jenkins-infra/jenkins.io#3885

@Mike4Online
Copy link

@jglick , in your CURL test, Content-Type text/html is not correct for a .war file. Should be application/octet-stream or some other binary mime type. And the redirected link https://get.jenkins.io/war/2.263/jenkins.war should permit download from a web browser (it gives Not Found instead).

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
dependencies Pull requests that update a dependency file major-bug For changelog: Major bug. Will be highlighted on the top of the changelog ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback regression-fix Pull request that fixes a regression in one of the previous Jenkins releases
Projects
None yet
6 participants