Merge pull request canonical#13522 from canonical/24.04

24.04
abhigyanghosh30 · Apr 25, 2024 · ab24817 · ab24817
2 parents 152058e + 9a3d6a0
commit ab24817
Show file tree

Hide file tree

Showing 48 changed files with 4,802 additions and 4,398 deletions.
diff --git a/meganav.yaml b/meganav.yaml
@@ -802,9 +802,9 @@ get_ubuntu:
         - links:
             - title: Ubuntu Desktop
               description: Free and reliable desktop OS
-              url: /download/desktop
-              secondary_cta_title: Download 22.04 LTS
-              secondary_cta_url: /download/desktop/thank-you?version=22.04.4&architecture=amd64
+              url: /desktop
+              secondary_cta_title: Download Ubuntu Desktop
+              secondary_cta_url: /download/desktop
             - title: Ubuntu flavours
               description: Variations of Ubuntu OS
               url: /download/flavours
@@ -868,7 +868,7 @@ get_ubuntu:
         - links:
             - title: Ubuntu for Raspberry Pi
               description: Single board computer
-              url: /raspberry-pi
+              url: /download/raspberry-pi
               secondary_cta_title: Get Ubuntu for Raspberry Pi
               secondary_cta_url: /download/raspberry-pi
             - title: Ubuntu Core for Raspberry Pi
@@ -896,6 +896,8 @@ get_ubuntu:
             - title: Ubuntu Core
               description: Embedded Linux
               url: /core
+              secondary_cta_title: Get Ubuntu Core
+              secondary_cta_url: /download/core
             - title: Internet of Things
               description: Ubuntu for IoT
               url: /internet-of-things
@@ -926,9 +928,6 @@ get_ubuntu:
               url: /raspberry-pi
             - title: RISC-V platforms
               url: /download/risc-v
-      section_footer:
-        cta_title: Get Ubuntu for IoT
-        cta_url: /download/iot
     - title: Develop on Ubuntu
       primary_links:
         - links:

diff --git a/navigation.yaml b/navigation.yaml
@@ -103,18 +103,6 @@ openstack:
     - title: Support
       path: /openstack/support
 
-raspberrypi:
-  title: Raspberry Pi
-  path: /raspberry-pi
-
-  children:
-    - title: Overview
-      path: /raspberry-pi
-    - title: Desktop
-      path: /raspberry-pi/desktop
-    - title: Server
-      path: /raspberry-pi/server
-
 financial-services:
   title: Finance
   path: /financial-services
@@ -270,8 +258,6 @@ desktop:
   children:
     - title: Overview
       path: /desktop
-    - title: Features
-      path: /desktop/features
     - title: Organisations
       path: /desktop/organisations
     - title: Developers
@@ -370,8 +356,8 @@ download:
       path: /download/desktop
     - title: Server
       path: /download/server
-    - title: IoT
-      path: /download/iot
+    - title: Core
+      path: /download/core
     - title: Cloud
       path: /download/cloud
 

diff --git a/package.json b/package.json
@@ -113,7 +113,7 @@
     "typescript": "4.5.4",
     "url-polyfill": "1.1.12",
     "url-search-params-polyfill": "8.1.1",
-    "vanilla-framework": "4.9.1",
+    "vanilla-framework": "4.10.0",
     "yup": "0.32.11"
   },
   "resolutions": {

diff --git a/redirects.yaml b/redirects.yaml
@@ -287,7 +287,7 @@ desktop/dev/?: "/desktop/developers"
 desktop/developers/thin-client/?: "/desktop"
 desktop/education/?: "/desktop/organisations"
 desktop/enterprise/?: "/desktop/organisations"
-desktop/features/.*/?: "/desktop/features"
+desktop/features/?: "/desktop"
 desktop/for-business/?: "/desktop/enterprise"
 desktop/for-developers/?: "/desktop/developers"
 desktop/get-ubuntu/alternative-download.*?: "/download/alternative-downloads"
@@ -308,11 +308,12 @@ desktop/tenders/contact-us/?: "/desktop/contact-us"
 desktop/tenders/thank-you/?: "/desktop/thank-you"
 desktop/ubuntu-kylin.*: "https://cn.ubuntu.com/desktop/"
 desktop/why.*/?: "/desktop"
+desktop/features: "/desktop"
 desktopedition/?: "/desktop"
 developer/?: "/desktop/developers"
 developer/blog/?: "https://snapcraft.io/blog"
 developer/community-resources/?: "https://forum.snapcraft.io"
-developer/core/?: "/download/iot"
+developer/core/?: "/download/core"
 developer/core/documentation/?: "https://docs.ubuntu.com"
 developer/core/examples/?: "https://forum.snapcraft.io"
 developer/core/examples/assertions/?: "https://forum.snapcraft.io"
@@ -321,26 +322,26 @@ developer/core/examples/hooks/?: "https://forum.snapcraft.io"
 developer/core/examples/interfaces/?: "https://forum.snapcraft.io"
 developer/core/examples/snaps-on-mir/?: "/tutorials/secure-ubuntu-kiosk"
 developer/core/get-started/?: "https://snapcraft.io/docs/getting-started"
-developer/core/get-started/artik-5-10/?: "/download/iot"
-developer/core/get-started/compute-module-3/?: "/download/iot/raspberry-pi-compute-module-3"
+developer/core/get-started/artik-5-10/?: "/download/core"
+developer/core/get-started/compute-module-3/?: "/download/raspberry-pi-compute-module-3"
 developer/core/get-started/developer-setup/?: "https://snapcraft.io/docs/getting-started"
-developer/core/get-started/dragonboard-410c/?: "/download/iot/qualcomm-dragonboard-410c"
-developer/core/get-started/installation-medias/?: "/download/iot/installation-media"
-developer/core/get-started/intel-joule/?: "/download/iot"
-developer/core/get-started/intel-nuc/?: "/download/iot/intel-nuc"
-developer/core/get-started/kvm/?: "/download/iot/kvm"
+developer/core/get-started/dragonboard-410c/?: "/download/qualcomm-dragonboard-410c"
+developer/core/get-started/installation-medias/?: "/download/installation-media"
+developer/core/get-started/intel-joule/?: "/download/core"
+developer/core/get-started/intel-nuc/?: "/download/intel-nuc"
+developer/core/get-started/kvm/?: "/download/kvm"
 developer/core/get-started/orange-pi-zero/?: "http://www.orangepi.org/downloadresources/"
-developer/core/get-started/raspberry-pi-2-3/?: "/download/iot/raspberry-pi-2-3"
+developer/core/get-started/raspberry-pi-2-3/?: "/download/raspberry-pi-2-3"
 developer/core/publish-and-distribute/?: "https://snapcraft.io"
 developer/core/troubleshooting/?: "https://forum.snapcraft.io"
 developer/core/tutorials/?: "https://snapcraft.io/tutorials"
 developer/snapcraft/?: "https://snapcraft.io"
 developer/start/ubuntu-for-devices/installing-ubuntu-for-devices/?: "https://ubports.com/"
 developer/start/ubuntu-for-devices/porting-new-device/?: "https://ubports.com/"
 developer/static/resources/ubuntu-core-16-security-whitepaper.pdf: "/internet-of-things"
-developer/target-platforms/?: "/download/iot"
-developer/target-platforms/boards/?: "/download/iot"
-developer/target-platforms/boards/up-squared/?: "/download/iot/up-squared-iot-grove-server"
+developer/target-platforms/?: "/download/core"
+developer/target-platforms/boards/?: "/download/core"
+developer/target-platforms/boards/up-squared/?: "/download/up-squared-iot-grove-server"
 developers/?: "/desktop/developers"
 developer-terms-and-conditions/?: "/legal/developer-terms-and-conditions"
 donations/?: "/download/desktop/contribute/"
@@ -359,9 +360,7 @@ download/cloud/install-ubuntu-openst/?: "/download/cloud"
 download/cloud/install-ubuntu-openstack/?: "/download/cloud"
 download/cloud/conjure-up/?: "/openstack/developer"
 download/cloud/autopilot/?: "/download/cloud"
-download/core/?: "/download/iot"
-download/core/up-squared-iot-grove/?: "/download/iot/up-squared-iot-grove-server"
-download/core(?P<page>/.*)/?: "/download/iot{page}"
+download/up-squared-iot-grove/?: "/download/up-squared-iot-grove-server"
 download/cloud/try-openstack/?: "/openstack/developer"
 openstack/developer?: "/openstack/install#workstation-deployment"
 download/cn/?: "https://cn.ubuntu.com/desktop/"
@@ -424,21 +423,24 @@ download/iot/orange-pi-zero/?: "http://www.orangepi.org/downloadresources/"
 download/iot/qualcomm-dragonboard-410c/?: "/download/qualcomm-dragonboard-410c"
 download/iot/intel-nuc/?: "/download/intel-nuc"
 download/iot/intel-nuc-desktop/?: "/download/intel-nuc-desktop"
-download/iot/intel-iotg/?: "/download/iot/intel-iot"
+download/iot/intel-iotg/?: "/download/intel-iot"
 download/orange-pi-zero/?: "http://www.orangepi.org/downloadresources/"
 download/raspberry-pi-2-3-core/?: "/download/raspberry-pi-core"
 download/raspberry-pi-compute-module-3/?: "/download/raspberry-pi-core"
-download/intel-joule/?: "/download/iot/"
-download/intel-joule-desktop/?: "/download/iot/"
-download/samsung-artik-5-10/?: "/download/iot/"
-download/samsung-artik-5-10-server/?: "/download/iot/"
+download/iot: "/download/core"
+download/intel-joule/?: "/download/core/"
+download/intel-joule-desktop/?: "/download/core/"
+download/samsung-artik-5-10/?: "/download/core/"
+download/samsung-artik-5-10-server/?: "/download/core/"
 download/iot/kvm/?: "/core/docs/getting-started"
 download/kvm/?: "/core/docs/getting-started"
 download/iot/up-squared-iot-grove-server/?: "/download/up-squared-iot-grove-server"
 download/releasenotes.*/?: "https://wiki.ubuntu.com/Releases"
 download/server/download/?: "/download/server"
+download/server/choose?: "/download/server#automated-provisioning"
 download/server/install-ubuntu-server/?: "/tutorials/tutorial-install-ubuntu-server"
 download/server/linuxone/?: "/download/server/s390x"
+download/server/multipass/?: "/download/server#instant-vms"
 download/server/power8/?: "/download/server/power"
 download/server/thank-you-linuxone/?: "/download/server/thank-you-s390x"
 download/server/step1/?: "/download/server/multipass"
@@ -476,7 +478,7 @@ engage/architecting-price-performance-private-cloud/?: "/engage/build-cost-effec
 engage/autonomous-more-profitable-farming-using-AI-and-lightweight-robots/?: "/engage/small-robot-company"
 engage/finance/?: "/engage/ubuntu-finance-sector-whitepaper"
 engage/iot-business-model2/?: "/engage/iot-business-model"
-engage/iot-elkhart-lake/?: "/download/iot/intel-iot"
+engage/iot-elkhart-lake/?: "/download/intel-iot"
 engage/kubernetes-case-study/?: "/engage/k8s-allan-gray"
 engage/multi-cloud-guide2/?: "/engage/a-business-guide-to-cloud-migration"
 engage/multi-cloud-guide/?: "/engage/a-business-guide-to-cloud-migration"
@@ -731,7 +733,8 @@ project/open-source/?: "/community/mission"
 promo.*/?: "/download"
 public-cloud/?: "/cloud/public-cloud"
 qct/?: "https://pages.canonical.com/QCTCloudHardware.html"
-raspberrypi(?P<page>.*)/?:  "/raspberry-pi{page}"
+raspberrypi(?P<page>.*)/?:  "/download/raspberry-pi"
+raspberry-pi(?P<page>.*)/?/?: "/download/raspberry-pi"
 realtime-kernel/?: "/real-time"
 release-end-of-life/?: "/about/release-cycle"
 release-notes/oneiric-ocelot/?: "https://wiki.ubuntu.com/OneiricOcelot/ReleaseNotes"

diff --git a/releases.yaml b/releases.yaml
@@ -10,7 +10,21 @@ latest:
   past_eol_date: false
   release_notes_url: "https://discourse.ubuntu.com/t/mantic-minotaur-release-notes/35534"
   iso_download_size: "4.5GB"
+  server_iso_size: "2.5GB"
+  rasp_pi_core_22_size: "263MB"
 lts:
+  slug: NobleNumbat
+  name: "Noble Numbat"
+  short_version: "24.04"
+  full_version: "24.04"
+  release_date: "April 2024"
+  eol: "April 2029"
+  release_notes_url: "https://discourse.ubuntu.com/t/noble-numbat-release-notes/24668"
+  iso_download_size: "6GB"
+  server_iso_size: "2.7GB"
+  raspi_desktop_iso_size: "2.6GB"
+  raspi_server_iso_size: "1GB"
+previous_lts:
   slug: JammyJellyfish
   name: "Jammy Jellyfish"
   short_version: "22.04"
@@ -19,37 +33,41 @@ lts:
   eol: "April 2027"
   release_notes_url: "https://discourse.ubuntu.com/t/jammy-jellyfish-release-notes/24668"
   iso_download_size: "4.7GB"
-previous_lts:
+  server_iso_size: "2GB"
+previous_previous_lts:
   name: "Focal Fossa"
   short_version: "20.04"
   full_version: "20.04.6"
   release_date: "April 2020"
   eol: "April 2025"
-previous_previous_lts:
-  name: "Bionic Beaver"
-  short_version: "18.04"
-  full_version: "18.04.6"
 openstack_lts:
   slug: Yoga
+core_lts:
+  version: "22"
+  eol: "April 2032"
 
 checksums:
   desktop:
+    "24.04": "81fae9cc21e2b1e3a9a4526c7dad3131b668e346c580702235ad4d02645d9455 *ubuntu-24.04-desktop-amd64.iso"
     "23.10.1": "3b6c5275366d02160554fa5703add462da3b8ce9be1749f8806e8dbbffaa2b5a *ubuntu-23.10.1-desktop-amd64.iso"
     "22.04.4": "071d5a534c1a2d61d64c6599c47c992c778e08b054daecc2540d57929e4ab1fd *ubuntu-22.04.4-desktop-amd64.iso"
     "21.10": "f8d3ab0faeaecb5d26628ae1aa21c9a13e0a242c381aa08157db8624d574b830 *ubuntu-21.10-desktop-amd64.iso"
     "20.04.6": "510ce77afcb9537f198bc7daa0e5b503b6e67aaed68146943c231baeaab94df1 *ubuntu-20.04.6-desktop-amd64.iso"
   live-server:
+    "24.04": "8762f7e74e4d64d72fceb5f70682e6b069932deedb4949c6975d0f0fe0a91be3 *ubuntu-24.04-live-server-amd64.iso"
     "23.10": "d2fb80d9ce77511ed500bcc1f813e6f676d4a3577009dfebce24269ca23346a5 *ubuntu-23.10-live-server-amd64.iso"
     "22.04.4": "45f873de9f8cb637345d6e66a583762730bbea30277ef7b32c9c3bd6700a32b2 *ubuntu-22.04.4-live-server-amd64.iso"
     "21.10": "e84f546dfc6743f24e8b1e15db9cc2d2c698ec57d9adfb852971772d1ce692d4 *ubuntu-21.10-live-server-amd64.iso"
     "20.04.6": "b8f31413336b9393ad5d8ef0282717b2ab19f007df2e9ed5196c13d8f9153c8b *ubuntu-20.04.6-live-server-amd64.iso"
     "18.04.6": "6c647b1ab4318e8c560d5748f908e108be654bad1e165f7cf4f3c1fc43995934 *ubuntu-18.04.6-live-server-amd64.iso"
   desktop-arm64+raspi:
+    "24.04": "016e508f44f3c82605747ad1e621710bd224df91dddf37f27903b0cd8ec3a11f *ubuntu-24.04-preinstalled-desktop-arm64+raspi.img.xz"
     "23.10": "92cbd905c36114effcec6943d3438845dfac07e3bb238cde4c510b41a71f694b *ubuntu-23.10-preinstalled-desktop-arm64+raspi.img.xz"
     "22.04.4": "9a4dbf8644d96fc55c0214454be8f50cb3cbf8b15d4475bba8f74679e2cd4411 *ubuntu-22.04.4-preinstalled-desktop-arm64+raspi.img.xz"
     "21.10": "5187d507099f26bc4d8218085109af498fae5ff93b40c668f83bab5c7574d954 *ubuntu-21.10-preinstalled-desktop-arm64+raspi.img.xz"
     "21.04": "d89ee327a00b98d7166b1a8cc95d17762aaacd3b4d0fc756c5b6b65df1708f48 *ubuntu-21.04-preinstalled-desktop-arm64+raspi.img.xz"
   server-arm64+raspi:
+    "24.04": "9b12b0e3a297ac8a0e13aef7cee0902102f3e2b925a0f3acaa28a32cddc73f4f *ubuntu-24.04-preinstalled-server-arm64+raspi.img.xz"
     "23.10": "81886cefc6b7abe5baf26dbc353bc69924dfc76416c15c3c3d03cf5ba30c90e8 *ubuntu-23.10-preinstalled-server-arm64+raspi.img.xz"
     "22.04.4": "8985915e3840d1e3971780aa160791e0665f64a2ee7e52ef8285c0701a8f6d6b *ubuntu-22.04.4-preinstalled-server-arm64+raspi.img.xz"
     "21.10": "126f940d3b270a6c1fc5a183ac8a3d193805fead4f517296a7df9d3e7d691a03 *ubuntu-21.10-preinstalled-server-arm64+raspi.img.xz"
@@ -60,6 +78,7 @@ checksums:
     "21.10": "341593c9607ed20744cd86941d94d73e3ba4f74e8ef2633eec63ce9b0cfac5a1 *ubuntu-21.10-preinstalled-server-armhf+raspi.img.xz"
     "20.04.5": "065c41846ddf7a1c636a1aac5a7d49ebcee819b141f9d57fd586c5f84b9b7942 *ubuntu-20.04.5-preinstalled-server-armhf+raspi.img.xz"
   server-riscv64:
+    "24.04": "4ba148baaef02a477c723771a26c9a1a3dd0736ad160fac3dc06fa91c20e3216 *ubuntu-24.04-live-server-riscv64.img.gz"
     "23.10": "5c300b9fff78f5d86fec06787e833573220165aeb310a8f1b5c56ca888bc91c2 *ubuntu-23.10-preinstalled-server-riscv64+unmatched.img.xz"
     "22.04.4": "fc86d5f6e1ddb1cb7f59255b4adc5872a103ba61fd6746a0fc1994d850f663c8 *ubuntu-22.04.4-preinstalled-server-riscv64+unmatched.img.xz"
     "21.10": "8067892fa627eb219b31dc629f31f3bda6b015dfeabf2fdc9b0ed150bf7984b8 *ubuntu-21.10-preinstalled-server-riscv64+unmatched.img.xz"

diff --git a/static/js/src/chart-data.js b/static/js/src/chart-data.js
@@ -83,21 +83,47 @@ export var serverAndDesktopReleases = [
     taskName: "22.04 LTS (Jammy Jellyfish)",
     status: "ESM",
   },
-  {
-    startDate: new Date("2023-04-20T00:00:00"),
-    endDate: new Date("2024-01-20T00:00:00"),
-    taskName: "23.04 (Lunar Lobster)",
-    status: "INTERIM_RELEASE",
-  },
   {
     startDate: new Date("2023-10-20T00:00:00"),
     endDate: new Date("2024-07-20T00:00:00"),
     taskName: "23.10 (Mantic Minotaur)",
     status: "INTERIM_RELEASE",
   },
+  {
+    startDate: new Date("2024-04-25T00:00:00"),
+    endDate: new Date("2034-04-25T00:00:00"),
+    taskName: "24.04 LTS (Noble Numbat)",
+    status: "MAIN_UNIVERSE",
+  },
+  {
+    startDate: new Date("2024-04-25T00:00:00"),
+    endDate: new Date("2029-04-25T00:00:00"),
+    taskName: "24.04 LTS (Noble Numbat)",
+    status: "HARDWARE_AND_MAINTENANCE_UPDATES",
+  },
+  {
+    startDate: new Date("2029-04-25T00:00:00"),
+    endDate: new Date("2034-04-25T00:00:00"),
+    taskName: "24.04 LTS (Noble Numbat)",
+    status: "ESM",
+  },
 ];
 
 export var kernelReleases = [
+  {
+    startDate: new Date("2024-04-01T00:00:00"),
+    endDate: new Date("2029-04-01T00:00:00"),
+    taskName: "24.04.0 LTS",
+    taskVersion: "6.8 kernel",
+    status: "LTS",
+  },
+  {
+    startDate: new Date("2029-04-01T00:00:00"),
+    endDate: new Date("2034-03-31T00:00:00"),
+    taskName: "24.04.0 LTS",
+    taskVersion: "6.8 kernel",
+    status: "ESM",
+  },
   {
     startDate: new Date("2024-02-01T00:00:00"),
     endDate: new Date("2024-08-01T00:00:00"),
@@ -1126,8 +1152,8 @@ export var microStackStatus = {
 };
 
 export var desktopServerReleaseNames = [
+  "24.04 LTS (Noble Numbat)",
   "23.10 (Mantic Minotaur)",
-  "23.04 (Lunar Lobster)",
   "22.04 LTS (Jammy Jellyfish)",
   "20.04 LTS (Focal Fossa)",
   "18.04 LTS (Bionic Beaver)",
@@ -1136,6 +1162,7 @@ export var desktopServerReleaseNames = [
 ];
 
 export var kernelReleaseNames = [
+  "24.04.0 LTS",
   "22.04.4 LTS",
   "23.10",
   "20.04.5 LTS",
@@ -1153,6 +1180,7 @@ export var kernelReleaseNames = [
 ];
 
 export var kernelVersionNames = [
+  "6.8",
   "6.5",
   "",
   "5.15",

diff --git a/static/sass/_pattern_navigation.scss b/static/sass/_pattern_navigation.scss
@@ -299,8 +299,18 @@ $meganav-height: 3rem;
 
           .p-navigation__item--dropdown-toggle:first-of-type,
           .p-navigation__item--dropdown-close:first-of-type {
-            > .p-navigation__link::before {
-              content: none;
+            > .p-navigation__link {
+              &::before {
+                content: none;
+              }
+            }
+          }
+
+          .p-navigation__item--dropdown-close:first-of-type {
+            > .p-navigation__link {
+              &::after {
+                transform: rotate(90deg);
+              }
             }
           }
 

diff --git a/static/sass/styles.scss b/static/sass/styles.scss
@@ -1588,3 +1588,11 @@ ol.p-list--divided .p-list__item::before {
     }
   }
 }
+
+.u-align-last--logo {
+  @media screen and (max-width: $breakpoint-large - 1) {
+    .p-logo-section__item {
+      margin-right: 2rem;
+    }
+  }
+}