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
replicatedhq · Aug 22, 2024 · 4bfbe96 · 4bfbe96
1 parent 8d3b3d7
commit 4bfbe96
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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"