From 4bfbe96a8281fc411ee6b675927e90f2f896b754 Mon Sep 17 00:00:00 2001 From: Andrew Lavery Date: Thu, 22 Aug 2024 03:25:37 -0400 Subject: [PATCH] Adding ubuntu 24.04 to testgrid and debugging containerd (#5343) * containerd debugging * remove ebtables-legacy * install containerd on ubuntu 24.04 * ensure always-fail tests do not run on new OSes * f * additional dependency packages for ubuntu 24.04 * another removed ebtables-legacy * only relevant tests this run * remove containerd changes --- addons/containerd/1.6.33/install.sh | 2 +- addons/containerd/template/base/install.sh | 2 +- testgrid/specs/os-firstlast.yaml | 5 +++++ testgrid/specs/os-full.yaml | 5 +++++ testgrid/specs/os-latest.yaml | 5 +++++ 5 files changed, 17 insertions(+), 2 deletions(-) diff --git a/addons/containerd/1.6.33/install.sh b/addons/containerd/1.6.33/install.sh index 56e79cab69..2df8471e65 100644 --- a/addons/containerd/1.6.33/install.sh +++ b/addons/containerd/1.6.33/install.sh @@ -117,7 +117,7 @@ function containerd_install() { function containerd_host_init() { require_centos8_containerd - require_amazon2023_containerd + require_os_containerd containerd_install_libzstd_if_missing } diff --git a/addons/containerd/template/base/install.sh b/addons/containerd/template/base/install.sh index 56e79cab69..2df8471e65 100644 --- a/addons/containerd/template/base/install.sh +++ b/addons/containerd/template/base/install.sh @@ -117,7 +117,7 @@ function containerd_install() { function containerd_host_init() { require_centos8_containerd - require_amazon2023_containerd + require_os_containerd containerd_install_libzstd_if_missing } diff --git a/testgrid/specs/os-firstlast.yaml b/testgrid/specs/os-firstlast.yaml index 049bf6010a..2fc63607eb 100644 --- a/testgrid/specs/os-firstlast.yaml +++ b/testgrid/specs/os-firstlast.yaml @@ -56,6 +56,11 @@ version: "22.04" vmimageuri: https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img preinit: "" +- id: ubuntu-2404 + name: Ubuntu + version: "24.04" + vmimageuri: https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img + preinit: "apt-get install -y containerd socat ebtables conntrack" - id: amazon-2023 name: Amazon Linux version: "2023" diff --git a/testgrid/specs/os-full.yaml b/testgrid/specs/os-full.yaml index a182ed157c..2e622966c0 100644 --- a/testgrid/specs/os-full.yaml +++ b/testgrid/specs/os-full.yaml @@ -67,6 +67,11 @@ version: "22.04" vmimageuri: https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img preinit: "" +- id: ubuntu-2404 + name: Ubuntu + version: "24.04" + vmimageuri: https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img + preinit: "apt-get install -y containerd socat ebtables conntrack" - id: amazon-2023 name: Amazon Linux version: "2023" diff --git a/testgrid/specs/os-latest.yaml b/testgrid/specs/os-latest.yaml index e6909e2aaa..2c7ac70360 100644 --- a/testgrid/specs/os-latest.yaml +++ b/testgrid/specs/os-latest.yaml @@ -46,6 +46,11 @@ version: "22.04" vmimageuri: https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img preinit: "" +- id: ubuntu-2404 + name: Ubuntu + version: "24.04" + vmimageuri: https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img + preinit: "apt-get install -y containerd socat ebtables conntrack" - id: amazon-2023 name: Amazon Linux version: "2023"