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-73845] Fix OperatingSystemEndOfLifeAdminMonitor endOfLifeDate displayed on first warning day #9908

Merged
merged 3 commits into from
Oct 25, 2024

Conversation

Dohbedoh
Copy link
Contributor

@Dohbedoh Dohbedoh commented Oct 24, 2024

See JENKINS-73845. On the first day the warning should be displayed, the EOL date displayed was the default 2099-12-31.

Testing done

  • Change the end-of-life-data.json with:
  {
    "pattern": "Ubuntu.* 20.04.*",
    "endOfLife": "2025-04-24"
  },
  • Build Jenkins WAR
  • Validate that it shows the monitor and the correct EOL date

Proposed changelog entries

  • Fix End of Life Operating System monitor that shows 2099-12-31 on the first day a warning should be displayed.

Proposed upgrade guidelines

N/A

Submitter checklist

Desired reviewers

@mention

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

Maintainer checklist

@Dohbedoh
Copy link
Contributor Author

Dohbedoh commented Oct 24, 2024

Not 100% of the result of the test case added. I believe as long as the running agent is linux (i.e. has an /etc/os-release) it should be fine. Maybe the test should be skipped for Windows though..
Maybe I should inject a file: for the test JSON.

@MarkEWaite MarkEWaite added the bug For changelog: Minor bug. Will be listed after features label Oct 24, 2024
Copy link
Member

@timja timja left a comment

Choose a reason for hiding this comment

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

Thanks!

@timja
Copy link
Member

timja commented Oct 24, 2024

/label ready-for-merge


This PR is now ready for merge, after ~24 hours, we will merge it if there's no negative feedback.

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 Oct 24, 2024
@MarkEWaite MarkEWaite merged commit 9e256de into jenkinsci:master Oct 25, 2024
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug For changelog: Minor bug. Will be listed after features ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants