Remove ubuntu 23.10 from the pipelines (#2756)

* Remove ubuntu 23.10 from the pipelines Fixes #2481 Signed-off-by: Dimitris Karakasilis <[email protected]> * Remove ubuntu 23.10 references from the dockerfile Signed-off-by: Mauro Morales <[email protected]> --------- Signed-off-by: Dimitris Karakasilis <[email protected]> Signed-off-by: Mauro Morales <[email protected]> Co-authored-by: Dimitris Karakasilis <[email protected]>
kairos-io · Jul 24, 2024 · 85c5c7e · 85c5c7e
1 parent 77a532a
commit 85c5c7e
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 101 deletions.
diff --git a/.github/flavors.json b/.github/flavors.json
@@ -29,7 +29,7 @@
         "arch": "arm64",
         "worker": "ubuntu-latest"
     },
-        {
+    {
         "family": "opensuse",
         "flavor": "opensuse",
         "flavorRelease": "leap-15.6",
@@ -209,56 +209,6 @@
         "arch": "arm64",
         "worker": "ubuntu-latest"
     },
-    {
-        "family": "ubuntu",
-        "flavor": "ubuntu",
-        "flavorRelease": "23.10",
-        "variant": "standard",
-        "model": "generic",
-        "baseImage": "ubuntu:23.10",
-        "arch": "amd64",
-        "worker": "self-hosted"
-    },
-    {
-        "family": "ubuntu",
-        "flavor": "ubuntu",
-        "flavorRelease": "23.10",
-        "variant": "core",
-        "model": "generic",
-        "baseImage": "ubuntu:23.10",
-        "arch": "amd64",
-        "worker": "self-hosted"
-    },
-    {
-        "family": "ubuntu",
-        "flavor": "ubuntu",
-        "flavorRelease": "23.10",
-        "variant": "standard",
-        "model": "rpi4",
-        "baseImage": "ubuntu:23.10",
-        "arch": "arm64",
-        "worker": "self-hosted"
-    },
-    {
-        "family": "ubuntu",
-        "flavor": "ubuntu",
-        "flavorRelease": "23.10",
-        "variant": "core",
-        "model": "rpi4",
-        "baseImage": "ubuntu:23.10",
-        "arch": "arm64",
-        "worker": "ubuntu-latest"
-    },
-    {
-        "family": "ubuntu",
-        "flavor": "ubuntu",
-        "flavorRelease": "23.10",
-        "variant": "core",
-        "model": "generic",
-        "baseImage": "ubuntu:23.10",
-        "arch": "arm64",
-        "worker": "ubuntu-latest"
-    },
     {
         "family": "ubuntu",
         "flavor": "ubuntu",
@@ -329,7 +279,7 @@
         "arch": "arm64",
         "worker": "ubuntu-latest"
     },
-        {
+    {
         "family": "alpine",
         "flavor": "alpine",
         "flavorRelease": "3.19",
@@ -349,7 +299,7 @@
         "arch": "arm64",
         "worker": "ubuntu-latest"
     },
-        {
+    {
         "family": "alpine",
         "flavor": "alpine",
         "flavorRelease": "3.19",

diff --git a/images/Dockerfile.kairos-ubuntu b/images/Dockerfile.kairos-ubuntu
@@ -9,7 +9,6 @@ ARG FAMILY=ubuntu
 ARG FLAVOR
 #   - 20.04
 #   - 22.04
-#   - 23.10 to be removed when 24.04 is officially released
 #   - 24.04
 ARG FLAVOR_RELEASE
 # Currently supported models are:
@@ -26,14 +25,12 @@ ARG BOOTLOADER=grub
 ###############################################################
 ####                     Upstream Images                   ####
 ###############################################################
-FROM ${BASE_IMAGE} AS ubuntu-24.04-upstream
-
-FROM ${BASE_IMAGE} AS ubuntu-23.10-upstream
-
 FROM ${BASE_IMAGE} AS ubuntu-20.04-upstream
 
 FROM ${BASE_IMAGE} AS ubuntu-22.04-upstream
 
+FROM ${BASE_IMAGE} AS ubuntu-24.04-upstream
+
 ###############################################################
 ####                build nohang from source               ####
 ###############################################################
@@ -159,9 +156,7 @@ RUN [ -z "$(ls -A /lib/firmware/intel-ucode/)" ] && apt-get update && apt-get in
 FROM systemd-boot AS systemd-boot-arm64
 
 FROM systemd-boot-amd64 AS systemd-boot-amd64-24.04
-FROM systemd-boot-amd64 AS systemd-boot-amd64-23.10
 FROM systemd-boot-arm64 AS systemd-boot-arm64-24.04
-FROM systemd-boot-arm64 AS systemd-boot-arm64-23.10
 
 FROM grub AS grub-amd64
 RUN apt-get update \
@@ -194,11 +189,9 @@ FROM grub-legacy AS grub-amd64-legacy
 FROM grub-legacy AS grub-arm64-legacy
 
 FROM grub-current AS grub-amd64-24.04
-FROM grub-current AS grub-amd64-23.10
 FROM grub-current AS grub-amd64-22.04
 FROM grub-legacy AS grub-amd64-20.04
 FROM grub-current AS grub-arm64-24.04
-FROM grub-current AS grub-arm64-23.10
 FROM grub-current AS grub-arm64-22.04
 FROM grub-legacy AS grub-arm64-20.04
 
@@ -256,7 +249,7 @@ RUN [ -z "$(ls -A /boot/vmlinuz*)" ] && apt-get install -y --no-install-recommen
     linux-image-generic-hwe-24.04 || true
 RUN apt-get clean && rm -rf /var/lib/apt/lists/*
 
-FROM base-ubuntu-current AS kernel-ubuntu-current
+FROM base-ubuntu-current AS kernel-ubuntu-22.04
 RUN apt-get update
 # If a kernel is already installed, don't try to install it again, this way the base image can
 # be non-hwe for older releases
@@ -273,13 +266,11 @@ RUN [ -z "$(ls -A /boot/vmlinuz*)" ] && apt-get install -y --no-install-recommen
 RUN apt-get clean && rm -rf /var/lib/apt/lists/*
 
 FROM kernel-ubuntu-20.04 AS amd64-ubuntu-20.04
-FROM kernel-ubuntu-current AS amd64-ubuntu-22.04
-FROM kernel-ubuntu-current AS amd64-ubuntu-23.10
+FROM kernel-ubuntu-22.04 AS amd64-ubuntu-22.04
 FROM kernel-ubuntu-24.04 AS amd64-ubuntu-24.04
 
 FROM kernel-ubuntu-20.04 AS arm64-ubuntu-20.04
-FROM kernel-ubuntu-current AS arm64-ubuntu-22.04
-FROM kernel-ubuntu-current AS arm64-ubuntu-23.10
+FROM kernel-ubuntu-22.04 AS arm64-ubuntu-22.04
 FROM kernel-ubuntu-24.04 AS arm64-ubuntu-24.04
 
 ###############################################################
@@ -302,24 +293,20 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     linux-firmware-raspi2 \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
-FROM rpicommon AS ubuntu-23.10-rpi
+FROM rpicommon AS ubuntu-22.04-rpi
 RUN apt-get update && apt-get install -y --no-install-recommends \
     linux-firmware-raspi \
     linux-modules-extra-raspi \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 FROM generic AS amd64-ubuntu-24.04-generic
-FROM generic AS amd64-ubuntu-23.10-generic
 FROM generic AS amd64-ubuntu-22.04-generic
 FROM generic AS amd64-ubuntu-20.04-generic
 
 FROM generic AS arm64-ubuntu-24.04-generic
-FROM generic AS arm64-ubuntu-23.10-generic
-FROM ubuntu-23.10-rpi AS arm64-ubuntu-24.04-rpi4
-FROM ubuntu-23.10-rpi AS arm64-ubuntu-23.10-rpi3
-FROM ubuntu-23.10-rpi AS arm64-ubuntu-23.10-rpi4
-FROM ubuntu-23.10-rpi AS arm64-ubuntu-22.04-rpi3
-FROM ubuntu-23.10-rpi AS arm64-ubuntu-22.04-rpi4
+FROM ubuntu-22.04-rpi AS arm64-ubuntu-24.04-rpi4
+FROM ubuntu-22.04-rpi AS arm64-ubuntu-22.04-rpi3
+FROM ubuntu-22.04-rpi AS arm64-ubuntu-22.04-rpi4
 FROM ubuntu-20.04-rpi AS arm64-ubuntu-20.04-rpi3
 FROM ubuntu-20.04-rpi AS arm64-ubuntu-20.04-rpi4
 FROM ubuntu-20.04-upstream AS arm64-ubuntu-20.04-nvidia-jetson-agx-orin
@@ -350,8 +337,6 @@ RUN apt-get update \
     selinux-policy-default \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
-FROM ubuntu-latest AS ubuntu-23.10
-
 FROM ${TARGETARCH}-${FLAVOR}-${FLAVOR_RELEASE}-${MODEL} AS ubuntu-legacy
 RUN find /usr/lib/firmware -type f ! -name "*.zst" -execdir zstd --rm -9 {} \+
 

diff --git a/images/Dockerfile.ubuntu b/images/Dockerfile.ubuntu
@@ -10,7 +10,6 @@ ARG FAMILY=ubuntu
 ARG FLAVOR
 #   - 20.04
 #   - 22.04
-#   - 23.10 to be removed when 24.04 is officially released
 #   - 24.04
 ARG FLAVOR_RELEASE
 # Currently supported models are:
@@ -27,14 +26,12 @@ ARG BOOTLOADER=grub
 ###############################################################
 ####                     Upstream Images                   ####
 ###############################################################
-FROM ${BASE_IMAGE} AS ubuntu-24.04-upstream
-
-FROM ${BASE_IMAGE} AS ubuntu-23.10-upstream
-
 FROM ${BASE_IMAGE} AS ubuntu-20.04-upstream
 
 FROM ${BASE_IMAGE} AS ubuntu-22.04-upstream
 
+FROM ${BASE_IMAGE} AS ubuntu-24.04-upstream
+
 ###############################################################
 ####                build nohang from source               ####
 ###############################################################
@@ -160,9 +157,7 @@ RUN [ -z "$(ls -A /lib/firmware/intel-ucode/)" ] && apt-get update && apt-get in
 FROM systemd-boot AS systemd-boot-arm64
 
 FROM systemd-boot-amd64 AS systemd-boot-amd64-24.04
-FROM systemd-boot-amd64 AS systemd-boot-amd64-23.10
 FROM systemd-boot-arm64 AS systemd-boot-arm64-24.04
-FROM systemd-boot-arm64 AS systemd-boot-arm64-23.10
 
 FROM grub AS grub-amd64
 RUN apt-get update \
@@ -195,11 +190,9 @@ FROM grub-legacy AS grub-amd64-legacy
 FROM grub-legacy AS grub-arm64-legacy
 
 FROM grub-current AS grub-amd64-24.04
-FROM grub-current AS grub-amd64-23.10
 FROM grub-current AS grub-amd64-22.04
 FROM grub-legacy AS grub-amd64-20.04
 FROM grub-current AS grub-arm64-24.04
-FROM grub-current AS grub-arm64-23.10
 FROM grub-current AS grub-arm64-22.04
 FROM grub-legacy AS grub-arm64-20.04
 
@@ -257,7 +250,7 @@ RUN [ -z "$(ls -A /boot/vmlinuz*)" ] && apt-get install -y --no-install-recommen
     linux-image-generic-hwe-24.04 || true
 RUN apt-get clean && rm -rf /var/lib/apt/lists/*
 
-FROM base-ubuntu-current AS kernel-ubuntu-current
+FROM base-ubuntu-current AS kernel-ubuntu-22.04
 RUN apt-get update
 # If a kernel is already installed, don't try to install it again, this way the base image can
 # be non-hwe for older releases
@@ -274,13 +267,11 @@ RUN [ -z "$(ls -A /boot/vmlinuz*)" ] && apt-get install -y --no-install-recommen
 RUN apt-get clean && rm -rf /var/lib/apt/lists/*
 
 FROM kernel-ubuntu-20.04 AS amd64-ubuntu-20.04
-FROM kernel-ubuntu-current AS amd64-ubuntu-22.04
-FROM kernel-ubuntu-current AS amd64-ubuntu-23.10
+FROM kernel-ubuntu-22.04 AS amd64-ubuntu-22.04
 FROM kernel-ubuntu-24.04 AS amd64-ubuntu-24.04
 
 FROM kernel-ubuntu-20.04 AS arm64-ubuntu-20.04
-FROM kernel-ubuntu-current AS arm64-ubuntu-22.04
-FROM kernel-ubuntu-current AS arm64-ubuntu-23.10
+FROM kernel-ubuntu-22.04 AS arm64-ubuntu-22.04
 FROM kernel-ubuntu-24.04 AS arm64-ubuntu-24.04
 
 ###############################################################
@@ -303,24 +294,20 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     linux-firmware-raspi2 \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
-FROM rpicommon AS ubuntu-23.10-rpi
+FROM rpicommon AS ubuntu-22.04-rpi
 RUN apt-get update && apt-get install -y --no-install-recommends \
     linux-firmware-raspi \
     linux-modules-extra-raspi \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 FROM generic AS amd64-ubuntu-24.04-generic
-FROM generic AS amd64-ubuntu-23.10-generic
 FROM generic AS amd64-ubuntu-22.04-generic
 FROM generic AS amd64-ubuntu-20.04-generic
 
 FROM generic AS arm64-ubuntu-24.04-generic
-FROM generic AS arm64-ubuntu-23.10-generic
-FROM ubuntu-23.10-rpi AS arm64-ubuntu-24.04-rpi4
-FROM ubuntu-23.10-rpi AS arm64-ubuntu-23.10-rpi3
-FROM ubuntu-23.10-rpi AS arm64-ubuntu-23.10-rpi4
-FROM ubuntu-23.10-rpi AS arm64-ubuntu-22.04-rpi3
-FROM ubuntu-23.10-rpi AS arm64-ubuntu-22.04-rpi4
+FROM ubuntu-22.04-rpi AS arm64-ubuntu-24.04-rpi4
+FROM ubuntu-22.04-rpi AS arm64-ubuntu-22.04-rpi3
+FROM ubuntu-22.04-rpi AS arm64-ubuntu-22.04-rpi4
 FROM ubuntu-20.04-rpi AS arm64-ubuntu-20.04-rpi3
 FROM ubuntu-20.04-rpi AS arm64-ubuntu-20.04-rpi4
 FROM ubuntu-20.04-upstream AS arm64-ubuntu-20.04-nvidia-jetson-agx-orin
@@ -351,8 +338,6 @@ RUN apt-get update \
     selinux-policy-default \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
-FROM ubuntu-latest AS ubuntu-23.10
-
 FROM ${TARGETARCH}-${FLAVOR}-${FLAVOR_RELEASE}-${MODEL} AS ubuntu-legacy
 RUN find /usr/lib/firmware -type f ! -name "*.zst" -execdir zstd --rm -9 {} \+