From bbc63fcb4d9551a92c4462c9586a5e557bab30b3 Mon Sep 17 00:00:00 2001 From: Akbar Abdrakhmanov Date: Fri, 23 Feb 2024 17:15:48 +0600 Subject: [PATCH 1/2] fix Kernel charts and tables for 24.04.4 release --- static/js/src/chart-data.js | 41 ++++++++++++++----- .../about/release_cycles/kernel-eol.html | 6 +-- .../shared/_kernel-support-schedule.html | 23 +++++++++-- 3 files changed, 54 insertions(+), 16 deletions(-) diff --git a/static/js/src/chart-data.js b/static/js/src/chart-data.js index 561999a86f9..7e05fa496d7 100644 --- a/static/js/src/chart-data.js +++ b/static/js/src/chart-data.js @@ -99,8 +99,8 @@ export var serverAndDesktopReleases = [ export var kernelReleases = [ { - startDate: null, - endDate: null, + startDate: new Date("2024-02-01T00:00:00"), + endDate: new Date("2024-08-01T00:00:00"), taskName: "22.04.4 LTS", taskVersion: "6.5 kernel", status: "LTS", @@ -115,7 +115,7 @@ export var kernelReleases = [ { startDate: new Date("2023-08-01T00:00:00"), endDate: new Date("2024-01-01T00:00:00"), - taskName: "22.04.4 LTS", + taskName: "22.04.3 LTS", taskVersion: "6.2 kernel", status: "LTS", }, @@ -317,7 +317,13 @@ export var kernelReleases2204 = [ { startDate: new Date("2023-08-16T00:00:00"), endDate: new Date("2024-01-18T00:00:00"), - taskName: "Ubuntu 22.04.4 LTS (v6.2)", + taskName: "Ubuntu 22.04.3 LTS (v6.2)", + status: "LTS", + }, + { + startDate: new Date("2024-02-01T00:00:00"), + endDate: new Date("2024-08-01T00:00:00"), + taskName: "Ubuntu 22.04.4 LTS (v6.5)", status: "LTS", }, ]; @@ -602,7 +608,7 @@ export var kernelReleasesALL = [ { startDate: new Date("2023-08-01T00:00:00"), endDate: new Date("2024-01-01T00:00:00"), - taskName: "Ubuntu 22.04.4 LTS (v6.2)", + taskName: "Ubuntu 22.04.3 LTS (v6.2)", status: "LTS", }, { @@ -611,6 +617,12 @@ export var kernelReleasesALL = [ taskName: "Ubuntu 23.10 (v6.5)", status: "INTERIM_RELEASE", }, + { + startDate: new Date("2024-02-01T00:00:00"), + endDate: new Date("2024-08-01T00:00:00"), + taskName: "Ubuntu 22.04.4 LTS (v6.5)", + status: "LTS", + }, ]; export var kernelReleasesLTS = [ @@ -767,7 +779,13 @@ export var kernelReleasesLTS = [ { startDate: new Date("2023-08-01T00:00:00"), endDate: new Date("2024-01-01T00:00:00"), - taskName: "Ubuntu 22.04.4 LTS (v6.2)", + taskName: "Ubuntu 22.04.3 LTS (v6.2)", + status: "LTS", + }, + { + startDate: new Date("2024-02-01T00:00:00"), + endDate: new Date("2024-08-01T00:00:00"), + taskName: "Ubuntu 22.04.4 LTS (v6.5)", status: "LTS", }, ]; @@ -1288,7 +1306,7 @@ export var desktopServerReleaseNames = [ ]; export var kernelReleaseNames = [ - "22.04.4 LTS (soon)", + "22.04.4 LTS", "23.10", "22.04.3 LTS", "22.04.2 LTS", @@ -1329,7 +1347,8 @@ export var kernelReleaseNames2204 = [ "Ubuntu 22.04.0 LTS (v5.15)", "Ubuntu 22.04.1 LTS (v5.15)", "Ubuntu 22.04.2 LTS (v5.19)", - "Ubuntu 22.04.4 LTS (v6.2)", + "Ubuntu 22.04.3 LTS (v6.2)", + "Ubuntu 22.04.4 LTS (v6.5)", ]; export var kernelReleaseNames2004 = [ @@ -1366,8 +1385,9 @@ export var kernelReleaseNamesALL = [ "Ubuntu 20.04.5 LTS (v5.15)", "Ubuntu 22.04.1 LTS (v5.15)", "Ubuntu 22.04.2 LTS (v5.19)", - "Ubuntu 22.04.4 LTS (v6.2)", + "Ubuntu 22.04.3 LTS (v6.2)", "Ubuntu 23.10 (v6.5)", + "Ubuntu 22.04.4 LTS (v6.5)", ]; export var kernelReleaseNamesLTS = [ @@ -1384,7 +1404,8 @@ export var kernelReleaseNamesLTS = [ "Ubuntu 20.04.5 LTS (v5.15)", "Ubuntu 22.04.1 LTS (v5.15)", "Ubuntu 22.04.2 LTS (v5.19)", - "Ubuntu 22.04.4 LTS (v6.2)", + "Ubuntu 22.04.3 LTS (v6.2)", + "Ubuntu 22.04.4 LTS (v6.5)", ]; export var openStackReleaseNames = [ diff --git a/templates/about/release_cycles/kernel-eol.html b/templates/about/release_cycles/kernel-eol.html index 3eb4c6c6972..9d75c9109ed 100644 --- a/templates/about/release_cycles/kernel-eol.html +++ b/templates/about/release_cycles/kernel-eol.html @@ -15,9 +15,9 @@

Ubuntu kernel support lifecycle

6.5 - 22.04.4 -   -   + 22.04.4 LTS + Feb 2024 + Aug 2024   diff --git a/templates/shared/_kernel-support-schedule.html b/templates/shared/_kernel-support-schedule.html index 17595e2e9af..1a31e955155 100644 --- a/templates/shared/_kernel-support-schedule.html +++ b/templates/shared/_kernel-support-schedule.html @@ -51,10 +51,15 @@

Kernel release schedule

Jul 2023 - Ubuntu 22.04.4 LTS (v6.2) + Ubuntu 22.04.3 LTS (v6.2) Aug 2023 Jan 2024 + + Ubuntu 22.04.4 LTS (v6.5) + Feb 2024 + Aug 2024 + @@ -274,11 +279,17 @@

Kernel release schedule

Jul 2023 - Ubuntu 22.04.4 LTS (v6.2) + Ubuntu 22.04.3 LTS (v6.2) Aug 2023   Jan 2024 + + Ubuntu 22.04.4 LTS (v6.5) + Feb 2024 +   + Aug 2024 + @@ -374,7 +385,7 @@

Kernel release schedule

Jul 2023 - Ubuntu 22.04.4 LTS (v6.2) + Ubuntu 22.04.3 LTS (v6.2)   Aug 2023 Jan 2023 @@ -385,6 +396,12 @@

Kernel release schedule

Oct 2023 Jul 2023 + + Ubuntu 22.04.4 LTS (v6.5) +   + Feb 2024 + Aug 2024 + From ecd8fddb1fd079e2baa0a697de7da98813744896 Mon Sep 17 00:00:00 2001 From: Akbar Abdrakhmanov Date: Fri, 23 Feb 2024 17:44:17 +0600 Subject: [PATCH 2/2] remove kernel versions 6.2 and 5.19 from kernel charts and tables --- static/js/src/chart-data.js | 60 ------------------- .../about/release_cycles/kernel-eol.html | 16 +---- .../shared/_kernel-support-schedule.html | 34 ----------- 3 files changed, 1 insertion(+), 109 deletions(-) diff --git a/static/js/src/chart-data.js b/static/js/src/chart-data.js index 7e05fa496d7..d9fc0f25da9 100644 --- a/static/js/src/chart-data.js +++ b/static/js/src/chart-data.js @@ -112,20 +112,6 @@ export var kernelReleases = [ taskVersion: "", status: "INTERIM_RELEASE", }, - { - startDate: new Date("2023-08-01T00:00:00"), - endDate: new Date("2024-01-01T00:00:00"), - taskName: "22.04.3 LTS", - taskVersion: "6.2 kernel", - status: "LTS", - }, - { - startDate: new Date("2023-02-01T00:00:00"), - endDate: new Date("2023-07-01T00:00:00"), - taskName: "22.04.2 LTS", - taskVersion: "5.19 kernel", - status: "LTS", - }, { startDate: new Date("2022-08-01T00:00:00"), endDate: new Date("2027-04-01T00:00:00"), @@ -308,18 +294,6 @@ export var kernelReleases2204 = [ taskName: "Ubuntu 22.04.1 LTS (v5.15)", status: "LTS", }, - { - startDate: new Date("2023-02-17T00:00:00"), - endDate: new Date("2023-07-22T00:00:00"), - taskName: "Ubuntu 22.04.2 LTS (v5.19)", - status: "LTS", - }, - { - startDate: new Date("2023-08-16T00:00:00"), - endDate: new Date("2024-01-18T00:00:00"), - taskName: "Ubuntu 22.04.3 LTS (v6.2)", - status: "LTS", - }, { startDate: new Date("2024-02-01T00:00:00"), endDate: new Date("2024-08-01T00:00:00"), @@ -599,18 +573,6 @@ export var kernelReleasesALL = [ taskName: "Ubuntu 22.04.1 LTS (v5.15)", status: "LTS", }, - { - startDate: new Date("2023-02-01T00:00:00"), - endDate: new Date("2023-07-01T00:00:00"), - taskName: "Ubuntu 22.04.2 LTS (v5.19)", - status: "LTS", - }, - { - startDate: new Date("2023-08-01T00:00:00"), - endDate: new Date("2024-01-01T00:00:00"), - taskName: "Ubuntu 22.04.3 LTS (v6.2)", - status: "LTS", - }, { startDate: new Date("2023-10-01T00:00:00"), endDate: new Date("2024-07-01T00:00:00"), @@ -770,18 +732,6 @@ export var kernelReleasesLTS = [ taskName: "Ubuntu 22.04.1 LTS (v5.15)", status: "CVE", }, - { - startDate: new Date("2023-02-01T00:00:00"), - endDate: new Date("2023-07-01T00:00:00"), - taskName: "Ubuntu 22.04.2 LTS (v5.19)", - status: "LTS", - }, - { - startDate: new Date("2023-08-01T00:00:00"), - endDate: new Date("2024-01-01T00:00:00"), - taskName: "Ubuntu 22.04.3 LTS (v6.2)", - status: "LTS", - }, { startDate: new Date("2024-02-01T00:00:00"), endDate: new Date("2024-08-01T00:00:00"), @@ -1308,8 +1258,6 @@ export var desktopServerReleaseNames = [ export var kernelReleaseNames = [ "22.04.4 LTS", "23.10", - "22.04.3 LTS", - "22.04.2 LTS", "22.04.1 LTS", "20.04.5 LTS", "22.04.0 LTS", @@ -1327,8 +1275,6 @@ export var kernelReleaseNames = [ export var kernelVersionNames = [ "6.5", "", - "6.2", - "5.19", "5.15", "", "", @@ -1346,8 +1292,6 @@ export var kernelVersionNames = [ export var kernelReleaseNames2204 = [ "Ubuntu 22.04.0 LTS (v5.15)", "Ubuntu 22.04.1 LTS (v5.15)", - "Ubuntu 22.04.2 LTS (v5.19)", - "Ubuntu 22.04.3 LTS (v6.2)", "Ubuntu 22.04.4 LTS (v6.5)", ]; @@ -1384,8 +1328,6 @@ export var kernelReleaseNamesALL = [ "Ubuntu 22.04.0 LTS (v5.15)", "Ubuntu 20.04.5 LTS (v5.15)", "Ubuntu 22.04.1 LTS (v5.15)", - "Ubuntu 22.04.2 LTS (v5.19)", - "Ubuntu 22.04.3 LTS (v6.2)", "Ubuntu 23.10 (v6.5)", "Ubuntu 22.04.4 LTS (v6.5)", ]; @@ -1403,8 +1345,6 @@ export var kernelReleaseNamesLTS = [ "Ubuntu 22.04.0 LTS (v5.15)", "Ubuntu 20.04.5 LTS (v5.15)", "Ubuntu 22.04.1 LTS (v5.15)", - "Ubuntu 22.04.2 LTS (v5.19)", - "Ubuntu 22.04.3 LTS (v6.2)", "Ubuntu 22.04.4 LTS (v6.5)", ]; diff --git a/templates/about/release_cycles/kernel-eol.html b/templates/about/release_cycles/kernel-eol.html index 9d75c9109ed..b10c0ab36d7 100644 --- a/templates/about/release_cycles/kernel-eol.html +++ b/templates/about/release_cycles/kernel-eol.html @@ -23,21 +23,7 @@

Ubuntu kernel support lifecycle

23.10 Oct 2023 - Jan 2024 -   - - - 6.2 - 22.04.3 LTS - Aug 2023 - Jan 2024 -   - - - 5.19 - 22.04.2 LTS - Feb 2023 - Jul 2023 + Jul 2024   diff --git a/templates/shared/_kernel-support-schedule.html b/templates/shared/_kernel-support-schedule.html index 1a31e955155..7848cb257b8 100644 --- a/templates/shared/_kernel-support-schedule.html +++ b/templates/shared/_kernel-support-schedule.html @@ -45,16 +45,6 @@

Kernel release schedule

Aug 2022 Apr 2027 - - Ubuntu 22.04.2 LTS (v5.19) - Feb 2023 - Jul 2023 - - - Ubuntu 22.04.3 LTS (v6.2) - Aug 2023 - Jan 2024 - Ubuntu 22.04.4 LTS (v6.5) Feb 2024 @@ -272,18 +262,6 @@

Kernel release schedule

Apr 2024 Apr 2027 - - Ubuntu 22.04.2 LTS (v5.19) - Feb 2023 -   - Jul 2023 - - - Ubuntu 22.04.3 LTS (v6.2) - Aug 2023 -   - Jan 2024 - Ubuntu 22.04.4 LTS (v6.5) Feb 2024 @@ -378,18 +356,6 @@

Kernel release schedule

Aug 2022 Apr 2027 - - Ubuntu 22.04.2 LTS (v5.19) -   - Feb 2023 - Jul 2023 - - - Ubuntu 22.04.3 LTS (v6.2) -   - Aug 2023 - Jan 2023 - Ubuntu 23.10 (v6.5)