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 LTS 2.440.2 #9014

Conversation

krisstern
Copy link
Member

@krisstern krisstern commented Mar 5, 2024

Latest core version: jenkins-2.448

Postponed
---------

JENKINS-72799           Minor                   Tue, 5 Mar 2024 13:24:45 +0000
        ConsoleLogFilter is not applied to all SlaveComputer logging
        https://issues.jenkins.io/browse/JENKINS-72799

Fixed
-----

JENKINS-72775           Minor                   2.444
        Update Winstone to 6.18 to get Jetty 10.0.20
        https://issues.jenkins.io/browse/JENKINS-72775

JENKINS-72711           Minor                   2.446
        Build History page no longer uses animated icons for builds in progress (regression in 2.434)
        regression
        https://issues.jenkins.io/browse/JENKINS-72711

JENKINS-72407           Major                   <a href="https://www.jenkins.io/changelog/?query#v2.443">https://www.jenkins.io/changelog/?query#v2.443</a>
        Build status icon missing for multibranch pipeline
        https://issues.jenkins.io/browse/JENKINS-72407

JENKINS-71148           Trivial                 2.447
        Do not display empty tooltips
        https://issues.jenkins.io/browse/JENKINS-71148

Submitter checklist

Preview Give feedback

Desired reviewers

N/A

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

Maintainer checklist

Preview Give feedback

mawinter69 and others added 3 commits March 5, 2024 21:33
* [JENKINS71148] avoid empty tooltips

when the tooltip or html tooltip is empty or whitespace only it is
avoided that the tippy is invoked at all which would otherwise just
display a small but empty element.

* better null checks

(cherry picked from commit 0675943)
…time trend views (jenkinsci#8966)

[JENKINS-72711] Restore progress animation in build history and build time trend views

Co-authored-by: Daniel Beck <daniel-beck@users.noreply.github.com>
(cherry picked from commit f91d1ec)
@github-actions github-actions bot added the into-lts This PR is filed against an LTS branch label Mar 5, 2024
@kmartens27
Copy link

@krisstern can you confirm whether

 JENKINS-72407           Major                   <a href="https://www.jenkins.io/changelog/?query#v2.443">https://www.jenkins.io/changelog/?query#v2.443</a>
        Build status icon missing for multibranch pipeline
        https://issues.jenkins.io/browse/JENKINS-72407

is the same as what's mentioned in the 2.440.1 backporting? I ask because the empty folder icons were included in the last LTS changelog.

Screenshot 2024-03-05 at 10 54 04 AM

I just want to make sure that it is included in the correct changelog, so if it did not get released as part of .1, then I need to adjust everything accordingly.

@krisstern
Copy link
Member Author

@kmartens27 Yes, the commit referring to in

JENKINS-72407           Major                   <a href="https://www.jenkins.io/changelog/?query#v2.443">https://www.jenkins.io/changelog/?query#v2.443</a>
        Build status icon missing for multibranch pipeline
        https://issues.jenkins.io/browse/JENKINS-72407

is an empty commit. Should be okay codewise. However, I am not sure if this is needed. I am including this resolved commit again for completeness' sake, so that we can close the JIRA issue for it.

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.

The fix for JENKINS-72407 was already backported to stable-2.440 in #8945. I do not see a need for an empty commit, as this feels like process for its own sake rather than for the sake of achieving any specific goal. But I do not feel strongly either way.

@daniel-beck
Copy link
Member

I changed the Jira labels from 2.440.2-fixed to 2.440.1-fixed to reflect reality. CC @NotMyFault who switched it back from 2.440.1-fixed to lts-candidate in case I'm missing something.

@krisstern krisstern force-pushed the feat/stable-2.440/backporting-2.440.2-1 branch from fb1a323 to 57ab550 Compare March 6, 2024 10:18
@krisstern
Copy link
Member Author

I have removed the commit for:

JENKINS-72407           Major                   <a href="https://www.jenkins.io/changelog/?query#v2.443">https://www.jenkins.io/changelog/?query#v2.443</a>
        Build status icon missing for multibranch pipeline
        https://issues.jenkins.io/browse/JENKINS-72407

@krisstern krisstern merged commit c43a863 into jenkinsci:stable-2.440 Mar 7, 2024
17 checks passed
@krisstern krisstern deleted the feat/stable-2.440/backporting-2.440.2-1 branch March 7, 2024 16:02
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.

6 participants