Backport end of life warning to stable-2.401 #8118

MarkEWaite · 2023-06-10T13:19:36Z

Backporting end of life warning to 2.401.2

Latest core version: 2.409

[JENKINS-71428] Warn when operating system end of life is approaching #7913
[JENKINS-71394] [JENKINS-71394] Fedora 38 should not show EOL warning until 2024 #8082

Fixed

JENKINS-71394           Enhancement             2.409
        Fedora 38 should not show EOL warning until 2024
        https://issues.jenkins.io/browse/JENKINS-71394

JENKINS-71428           Enhancement             2.407
        Warn when operating system end of life is approaching
        https://issues.jenkins.io/browse/JENKINS-71428

Testing done

Confirmed that the warning is not displayed on a current operating system.

Confirmed that the warning is displayed when run inside the Jenkins CentOS 7 container image.

Proposed changelog entries

Warn administrators when their Linux operating system is approaching end of life.

Proposed upgrade guidelines

N/A

Submitter checklist

Give feedback

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

Desired reviewers

@timja and @krisstern

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

Maintainer checklist

Give feedback

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

* Ubuntu 18.04 end of life admin monitor First prototype that includes a user interface and localized messages with parameters to support the specific operating system. * Use a base class for common features Admin monitors are disabled and enabled by a user interface action. There is not an obvious way to detect that a date has passed so that it should be enabled again. * Better comment * Make the logging clearer * Split pattern check to separate method * Add a message to show after end of life * Suppress most logging * Minor logging improvements * Use actual end of life date for Ubuntu 18.04 * Logger not needed * Add Alpine 3.14 end of life admin monitor * Add Alpine 3.15 end of life monitor * Add Alpine 3.16 end of life monitor * Add Alpine 3.17 end of life monitor * Spotless cleanup * Add Fedora 37, 38, and Red Hat 7 * More accurate regex to detect version * Add Debian 10 end of life admin monitor * Add a few tests * Add another test * Fix checkstyle violations * Fix spotbugs warning * Correct the copyright * Make test viable on non-Linux machines Do not depend on the existence of /etc/os-release * Name the setup function more accurately * Test a file with non-matching content * Test the Alpine end of life admin monitors * Add more tests * Test Fedora 37 admin monitor * Add RHEL 7 test * Announce RHEL 7 early end of support immediately * Use consistent logging calls * Add Red Hat 8 to RHEL 7 as a test * Use past date to report RHEL 7 end of life * Remove Red Hat 8 from RHEL 7 end of life * Log more information * Display end of support date Incorrect to declare end of support as the date when we begin warning the user about end of life. * Add descriptions of the admin monitors * Use a better redirect URL * Group admin monitors better by display name * Remove unnused message.properties files * Add description.jelly file * Better description of the admin monitors * Add endOfSupportDate getter Needed for UI * Fix minor indentation error * Each monitor must be independently disabled * Repurpose identifier for use in disabled property Don't need the idenitfier anywhere except in the initial constructor call that is later used to enable and disable the admin monitor. * Add Red Hat 8 to RHEL 7 as a test * Add os-release tests and data files * Remove unused URL arg to constructor * Reduce duplication in data Easier to test with symbolic constants that are consistently named across all the classes. Includes tests of os-release files from each of the end of life operating systems * Fix inaccurate comment * Use constant for documentation URL * Remove RHEL 8 from RHEL 8 Admin Monitor * Fedora 36 security support ends 18 May 2023 * Fedora 37 support ends 15 Dec 2023 * Fix spelling error in description * Read data file with UTF-8 character set * Do not use extension point name in symbol * Use single word 'Ignore' in button, not name of monitor * Use a smaller layout for monitor name * Include operating system version in RHEL 7 check Includes a TODO comment to remove the RHEL 8 entry that I use for testing and development * Fix regex syntax error * First prototype using a data file * Start the conversion to a single monitor * Latest experiments with end of life data as JSON * More exploring and evolving * Remove Alpine admin monitor * Remove Fedora admin monitor * Remove Debian admin monitor * Remove Ubuntu admin monitor * Throw IOException rather than check for null IOException should be uncommon and mistakes should be detected by automated tests * Stop inheriting from EndOfLifeAdminMonitor * Simplify initialization logic Else clauses not required due to break. * Add isActivated implementation * Add setDisabled test method * Minor formatting changes * Test some additional methods * Call super in constructor * Minor updates from study of upstream class * Format JSON data * Fix formatting errors * Fix assertion * Better variable naming * Explain the purpose of ignoreEndOfLife flag * Remove unused import * Store the pretty name, not the pattern * Test pretty name with sample os-release data files * Remove RedHat 7 specific monitor * Set RHEL 8 end of life early for test * Ongoing debugging * Describe the monitor * Honor start date * Add pretty name as monitor attribute * Add end of support date * Remove earlier implementations * Move end of life data * Rename end of support to end of life End of life is used throughout the monitor * Improve message with after end of life date status * Undo .gitignore change * Rename effective date to end of life date * Rename pretty name to operating system name * More rename of prettyName * Fix logging mistakes * Add RHEL 8 * Default start date is 6 months before end of life * Add operating system end of life patterns and dates * Fix JSON file formatting * Simplify logging code * Better logging * Add Alma and Rocky Linux tests and patterns * Add methods to help test automation * Remove unused methods * Start warning RHEL 7 users immediately * Suppress spotbugs traversal_in warning - false positive * Throw IOException on bad data file Fail tests quickly when a a bad data file is used * Better exception message * Correct RHEL 8 end of life date * Enable isActivated test * Increase test coverage * Fix spelling error Co-authored-by: Alexander Brandes <brandes.alexander@web.de> * Remove non-breaking spaces from message Non-breaking spaces are not recommended. Co-authored-by: Tim Jacomb <21194782+timja@users.noreply.github.com> * Rename class to match symbol https://github.com/jenkinsci/jenkins/pull/7913/files#r1199814150 * Sort end of life data alphabetically * Included OS query parameter and fragment in docs URL The fragment may be useful in the future for analytics. Harmless to send the fragment to www.jenkins.io and www.jenkins.io may be able to make use of it to direct the reader to information that is specific to their operating system. * Scientific Linux 8 does not exist * Remove fragment, only need query parameter jenkinsci#7913 (comment) is the comment that prompted the improvement. --------- Co-authored-by: Alexander Brandes <brandes.alexander@web.de> Co-authored-by: Tim Jacomb <21194782+timja@users.noreply.github.com> Co-authored-by: Alexander Brandes <mc.cache@web.de> (cherry picked from commit ab06bf5)

…kinsci#8082) Fedora 38 should not show EOL warning until 2024 Co-authored-by: Mark Waite <mark.earl.waite@gmail.com> (cherry picked from commit 8b81750)

When I submitted jenkinsci#8118 , the task list failed to render until I removed the indented list item

GitHub task lists do not support indented lists yet When I submitted #8118 , the task list failed to render until I removed the indented list item

krisstern

LGTM

MarkEWaite and others added 2 commits June 10, 2023 06:20

[JENKINS-71394] Fedora 38 should not show EOL warning until 2024 (jen…

1e439ad

…kinsci#8082) Fedora 38 should not show EOL warning until 2024 Co-authored-by: Mark Waite <mark.earl.waite@gmail.com> (cherry picked from commit 8b81750)

MarkEWaite requested review from krisstern and timja June 10, 2023 13:19

MarkEWaite added the into-lts This PR is filed against an LTS branch label Jun 10, 2023

MarkEWaite added a commit to MarkEWaite/jenkins that referenced this pull request Jun 10, 2023

GitHub task lists do not support indented lists yet

d4322a3

When I submitted jenkinsci#8118 , the task list failed to render until I removed the indented list item

MarkEWaite mentioned this pull request Jun 10, 2023

Remove nested list from GitHub tasklist #8119

Merged

NotMyFault approved these changes Jun 10, 2023

View reviewed changes

NotMyFault pushed a commit that referenced this pull request Jun 10, 2023

Remove nested list from GitHub tasklist (#8119)

c470f19

GitHub task lists do not support indented lists yet When I submitted #8118 , the task list failed to render until I removed the indented list item

krisstern approved these changes Jun 11, 2023

View reviewed changes

krisstern mentioned this pull request Jun 11, 2023

LTS 2.401.2 jenkins-infra/release#382

Closed

39 tasks

MarkEWaite added the rfe For changelog: Minor enhancement. use `major-rfe` for changes to be highlighted label Jun 11, 2023

timja approved these changes Jun 11, 2023

View reviewed changes

NotMyFault merged commit 08ecdbb into jenkinsci:stable-2.401 Jun 11, 2023

MarkEWaite deleted the stable-2.401-backport-eol-warning branch June 11, 2023 18:11

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Backport end of life warning to stable-2.401 #8118

Backport end of life warning to stable-2.401 #8118

MarkEWaite commented Jun 10, 2023 •

edited

Loading

Submitter checklist

Maintainer checklist

krisstern left a comment

Backport end of life warning to stable-2.401 #8118

Backport end of life warning to stable-2.401 #8118

Conversation

MarkEWaite commented Jun 10, 2023 • edited Loading

Backporting end of life warning to 2.401.2

Fixed

Testing done

Proposed changelog entries

Proposed upgrade guidelines

Submitter checklist

Desired reviewers

Maintainer checklist

krisstern left a comment

Choose a reason for hiding this comment

MarkEWaite commented Jun 10, 2023 •

edited

Loading