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

Backporting for 2.426.1 #8658

Merged
merged 8 commits into from
Oct 31, 2023

Conversation

MarkEWaite
Copy link
Contributor

@MarkEWaite MarkEWaite commented Oct 29, 2023

Backporting for LTS 2.426.1

Latest core version: Jenkins 2.429

Fixed

JENKINS-72248           Minor                   2.428
        Backport uptime telemetry
        https://issues.jenkins.io/browse/JENKINS-72248

JENKINS-72189           Major                   2.430
        Drag&Drop for repeatables not working for existing entries (regression in 2.335)
        regression
        https://issues.jenkins.io/browse/JENKINS-72189

JENKINS-72179           Minor                   2.429
        Parameters view of builds does not show descriptions of checkbox parameters (regression in 2.179)
        regression
        https://issues.jenkins.io/browse/JENKINS-72179

JENKINS-72170           Major                   2.428
        Cannot add additional branch sources in multibranch pipeline after 2.422
        regression
        https://issues.jenkins.io/browse/JENKINS-72170

JENKINS-72163           Major                   3160.vd76b_9ddd10cc
        Retry on initial connection failure occurs in one entrypoint but not the other
        https://issues.jenkins.io/browse/JENKINS-72163

JENKINS-72156           Minor                   2.428, 2.414.3
        Include Jetty 10.0.17 in a Jenkins release
        https://issues.jenkins.io/browse/JENKINS-72156

JENKINS-72020           Minor                   2.428
        Unable to reorder clouds anymore via UI
        https://issues.jenkins.io/browse/JENKINS-72020

JENKINS-71937           Major                   2.427
        Jenkins 2.421 breaks vSphere Cloud agent labels
        regression
        https://issues.jenkins.io/browse/JENKINS-71937

JENKINS-71252           Critical                2.427
        Form validation is never displayed for fields initially hidden under Advanced section (regression in 2.355)
        regression
        https://issues.jenkins.io/browse/JENKINS-71252

JENKINS-70793           Minor                   2.427
        Form validation does not clear previous errors (regression in 2.355)
        regression
        https://issues.jenkins.io/browse/JENKINS-70793

JENKINS-65368           Major                   3159.vb_8c0ef2b_55a_f as included in 2.428
        Remoting agent.jar does not work behind proxy
        https://issues.jenkins.io/browse/JENKINS-65368

The developer mailing list has the backporting announcement. The 2.426.1 release checklist has more information as well.

Several candidates are not included in this pull request, but the authors of those candidates have been asked if those changes should be included in the 2.426.1 LTS backports. Those include:

Testing done

Ran the generated war file interactively with Java 11, Java 17, and Java 21 and confirmed that it was well behaved with a few minutes of interactive testing.

Ran tests successfully with mvn clean verify on Linux.

Proposed changelog entries

N/A - changelog will be created by the documentation team.

Proposed upgrade guidelines

N/A - no items in this pull request that need an entry in the upgrade guide

Submitter checklist

  • The Jira issue, if it exists, is well-described.
  • The changelog entries and upgrade guidelines are appropriate for the audience affected by the change (users or developers, depending on the change) and are in the imperative mood (see examples). Fill in the Proposed upgrade guidelines section only if there are breaking changes or changes that may require extra steps from users during upgrade.
  • There is automated testing or an explanation as to why this change has no tests.
  • New public classes, fields, and methods are annotated with @Restricted or have @since TODO Javadocs, as appropriate.
  • New deprecations are annotated with @Deprecated(since = "TODO") or @Deprecated(forRemoval = true, since = "TODO"), if applicable.
  • New or substantially changed JavaScript is not defined inline and does not call eval to ease future introduction of Content Security Policy (CSP) directives (see documentation).
  • For dependency updates, there are links to external changelogs and, if possible, full differentials.
  • For new APIs and extension points, there is a link to at least one consumer.

Desired reviewers

@NotMyFault

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

Maintainer checklist

  • There are at least two (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 is not blocking the change.
  • Changelog entries in the pull request 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, the upgrade-guide-needed label is set and there is a Proposed upgrade guidelines section in the pull request title (see 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).

Vlatombe and others added 5 commits October 28, 2023 20:00
[JENKINS-71937] Fix deprecated Slave constructor

Got broken in jenkinsci#8395

Co-authored-by: Basil Crow <[email protected]>

(cherry picked from commit 6fdfdd0)
… Jetty 10.0.17 (jenkinsci#8587)

Upgrade to Winstone 6.14 which contains an upgrade to Jetty 10.0.17

Signed-off-by: Olivier Lamy <[email protected]>

(cherry picked from commit 8792ea0)
…sci#8422)

* [JENKINS-71252] Show form validation for hidden elements

* [JENKINS-70793] Clear all validation output on update

---------

Co-authored-by: Daniel Beck <[email protected]>

(cherry picked from commit 012fa00)
… and buttons (jenkinsci#8602)

* [JENKINS-72170] fix for nested-hetero-list entries

when a plugin defines the hetero-list elements on its own and still uses
an <input type="button"> element and an inner element is already using
a hetero-list with a <button> element, then the old input wasn't
converted to a button as the inner button was found first.
Avoid this by converting all inputs to buttons before actually looking
up the button.

Recreate the hetero-list.js file to avoid the "No such adjunct found"
warning message

* remove hetero-list.js again

(cherry picked from commit 97dde8f)
…76b_9ddd10cc (jenkinsci#8600)

Bump org.jenkins-ci.main:remoting

Bumps [org.jenkins-ci.main:remoting](https://github.com/jenkinsci/remoting) from 3148.v532a_7e715ee3 to 3160.vd76b_9ddd10cc.
- [Release notes](https://github.com/jenkinsci/remoting/releases)
- [Changelog](https://github.com/jenkinsci/remoting/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jenkinsci/remoting/commits)

---
updated-dependencies:
- dependency-name: org.jenkins-ci.main:remoting
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

(cherry picked from commit aea86c4)
@MarkEWaite MarkEWaite added the into-lts This PR is filed against an LTS branch label Oct 29, 2023
MarkEWaite referenced this pull request in jenkins-infra/update-center2 Oct 29, 2023
* [JENKINS-72020] Reorder clouds

Adding back controls to reorder clouds.

Since clouds order is taken into account for node provisioning, users should be able to reorder them as needed.

* Use tertiary buttons

* Separate screen for reordering

* Include reordering in the cloud list directly (thanks @timja)

* Show the save button after the first reordering

* Separate JS

Only display order column when admin

* Fix reviews

* Remove unused string

* Put drag-and-drop handle in the cloud icon column

* Add missing permission check

* Add a small blurb to clarify what cloud order is used for.

(cherry picked from commit 16bca2e)
@MarkEWaite
Copy link
Contributor Author

Based on the answer from @timja I've added e6b453b , a backport of the fix for JENKINS-72020 - Restore ability to reorder clouds

@MarkEWaite
Copy link
Contributor Author

MarkEWaite commented Oct 30, 2023

@daniel-beck replied and marked two issues as LTS candidates so they are included as 5080643 and b560797

Those are backports of:

@@ -86,7 +86,7 @@ THE SOFTWARE.
<changelog.url>https://www.jenkins.io/changelog</changelog.url>

<!-- Bundled Remoting version -->
<remoting.version>3148.v532a_7e715ee3</remoting.version>
<remoting.version>3160.vd76b_9ddd10cc</remoting.version>
Copy link
Member

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for pointing to that difference! I had missed that there is an additional bug fix that is included in remoting 3160 as delivered in Jenkins 2.428. The additional fix is JENKINS-65368 Remoting agent.jar does not work behind proxy. I've labeled that bug report as 2.426.1-fixed in Jira and included it in the pull request description

@MarkEWaite MarkEWaite merged commit 9f3db79 into jenkinsci:stable-2.426 Oct 31, 2023
17 checks passed
@MarkEWaite MarkEWaite deleted the stable-2.426-backports branch October 31, 2023 19:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
into-lts This PR is filed against an LTS branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants