Merge pull request #13615 from akbarkz/task/WD-9102-fix_kernel_chart

[WD-9102] fix Kernel charts and tables for 22.04.4 release
canonical · Feb 23, 2024 · 9b0280a · 9b0280a
2 parents 411c2b6 + ecd8fdd
commit 9b0280a
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 103 deletions.
diff --git 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",
@@ -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.4 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"),
@@ -309,15 +295,9 @@ export var kernelReleases2204 = [
     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.4 LTS (v6.2)",
+    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",
   },
 ];
@@ -593,24 +573,18 @@ 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.4 LTS (v6.2)",
-    status: "LTS",
-  },
   {
     startDate: new Date("2023-10-01T00:00:00"),
     endDate: new Date("2024-07-01T00:00:00"),
     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 = [
@@ -759,15 +733,9 @@ export var kernelReleasesLTS = [
     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.4 LTS (v6.2)",
+    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,10 +1256,8 @@ 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",
   "22.04.1 LTS",
   "20.04.5 LTS",
   "22.04.0 LTS",
@@ -1309,8 +1275,6 @@ export var kernelReleaseNames = [
 export var kernelVersionNames = [
   "6.5",
   "",
-  "6.2",
-  "5.19",
   "5.15",
   "",
   "",
@@ -1328,8 +1292,7 @@ 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.4 LTS (v6.2)",
+  "Ubuntu 22.04.4 LTS (v6.5)",
 ];
 
 export var kernelReleaseNames2004 = [
@@ -1365,9 +1328,8 @@ 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.4 LTS (v6.2)",
   "Ubuntu 23.10 (v6.5)",
+  "Ubuntu 22.04.4 LTS (v6.5)",
 ];
 
 export var kernelReleaseNamesLTS = [
@@ -1383,8 +1345,7 @@ 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.4 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
@@ -15,29 +15,15 @@ <h3>Ubuntu kernel support lifecycle</h3>
       <tbody>
         <tr>
           <td rowspan="2"><strong>6.5</strong></td>
-          <td><strong>22.04.4</strong></td>
-          <td>&nbsp;</td>
-          <td>&nbsp;</td>
+          <td><strong>22.04.4 LTS</strong></td>
+          <td>Feb 2024</td>
+          <td>Aug 2024</td>
           <td>&nbsp;</td>
         </tr>
         <tr>
           <td><strong>23.10</strong></td>
           <td>Oct 2023</td>
-          <td>Jan 2024</td>
-          <td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td><strong>6.2</strong></td>
-          <td><strong>22.04.3 LTS</strong></td>
-          <td>Aug 2023</td>
-          <td>Jan 2024</td>
-          <td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td><strong>5.19</strong></td>
-          <td><strong>22.04.2 LTS</strong></td>
-          <td>Feb 2023</td>
-          <td>Jul 2023</td>
+          <td>Jul 2024</td>
           <td>&nbsp;</td>
         </tr>
         <tr>

diff --git a/templates/shared/_kernel-support-schedule.html b/templates/shared/_kernel-support-schedule.html
@@ -46,14 +46,9 @@ <h2>Kernel release schedule</h2>
             <td>Apr 2027</td>
           </tr>
           <tr>
-            <td><strong>Ubuntu 22.04.2 LTS (v5.19)</strong></td>
-            <td>Feb 2023</td>
-            <td>Jul 2023</td>
-          </tr>
-          <tr>
-            <td><strong>Ubuntu 22.04.4 LTS (v6.2)</strong></td>
-            <td>Aug 2023</td>
-            <td>Jan 2024</td>
+            <td><strong>Ubuntu 22.04.4 LTS (v6.5)</strong></td>
+            <td>Feb 2024</td>
+            <td>Aug 2024</td>
           </tr>
         </tbody>
       </table>
@@ -268,16 +263,10 @@ <h2>Kernel release schedule</h2>
             <td>Apr 2027</td>
           </tr>
           <tr>
-            <td><strong>Ubuntu 22.04.2 LTS (v5.19)</strong></td>
-            <td>Feb 2023</td>
+            <td><strong>Ubuntu 22.04.4 LTS (v6.5)</strong></td>
+            <td>Feb 2024</td>
             <td>&nbsp;</td>
-            <td>Jul 2023</td>
-          </tr>
-          <tr>
-            <td><strong>Ubuntu 22.04.4 LTS (v6.2)</strong></td>
-            <td>Aug 2023</td>
-            <td>&nbsp;</td>
-            <td>Jan 2024</td>
+            <td>Aug 2024</td>
           </tr>
         </tbody>
       </table>
@@ -368,22 +357,16 @@ <h2>Kernel release schedule</h2>
             <td>Apr 2027</td>
           </tr>
           <tr>
-            <td><strong>Ubuntu 22.04.2 LTS (v5.19)</strong></td>
+            <td>Ubuntu 23.10 (v6.5)</td>
             <td>&nbsp;</td>
-            <td>Feb 2023</td>
+            <td>Oct 2023</td>
             <td>Jul 2023</td>
           </tr>
           <tr>
-            <td><strong>Ubuntu 22.04.4 LTS (v6.2)</strong></td>
+            <td><strong>Ubuntu 22.04.4 LTS (v6.5)</strong></td>
             <td>&nbsp;</td>
-            <td>Aug 2023</td>
-            <td>Jan 2023</td>
-          </tr>
-          <tr>
-            <td>Ubuntu 23.10 (v6.5)</td>
-            <td>&nbsp;</td>
-            <td>Oct 2023</td>
-            <td>Jul 2023</td>
+            <td>Feb 2024</td>
+            <td>Aug 2024</td>
           </tr>
         </tbody>
       </table>