Add Ubuntu 24.04 to integration testing. (#4898)

* Add Ubuntu 24.04 to integration testing.

* Fix unit test.

* Add -amd64 to end.

Author: blakerouse

pkg/testing/multipass/provisioner.go

@@ -54,7 +54,7 @@ func (p *provisioner) Supported(os define.OS) bool {
 	if os.Distro != Ubuntu {
 		return false
 	}
-	if os.Version != "20.04" && os.Version != "22.04" {
+	if os.Version != "20.04" && os.Version != "22.04" && os.Version != "24.04" {
 		return false
 	}
 	// multipass only supports the same architecture of the host

pkg/testing/ogc/supported.go

@@ -20,6 +20,19 @@ const (
 // one in this list will be picked. So it's best to place the one that we want the
 // most testing at the top.
 var ogcSupported = []LayoutOS{
+	{
+		OS: define.OS{
+			Type:    define.Linux,
+			Arch:    define.AMD64,
+			Distro:  runner.Ubuntu,
+			Version: "24.04",
+		},
+		Provider:     Google,
+		InstanceSize: "e2-standard-2", // 2 amd64 cpus, 8 GB RAM
+		RunsOn:       "ubuntu-2404-lts-amd64",
+		Username:     "ubuntu",
+		RemotePath:   "/home/ubuntu/agent",
+	},
 	{
 		OS: define.OS{
 			Type:    define.Linux,
@@ -54,6 +67,19 @@ var ogcSupported = []LayoutOS{
 	// 		Type:    define.Linux,
 	// 		Arch:    define.ARM64,
 	// 		Distro:  runner.Ubuntu,
+	// 		Version: "24.04",
+	// 	},
+	// 	Provider:     Google,
+	// 	InstanceSize: "t2a-standard-4", // 4 arm64 cpus, 16 GB RAM
+	// 	RunsOn:       "ubuntu-2404-lts-arm64",
+	// 	Username:     "ubuntu",
+	// 	RemotePath:   "/home/ubuntu/agent",
+	// },
+	// {
+	// 	OS: define.OS{
+	// 		Type:    define.Linux,
+	// 		Arch:    define.ARM64,
+	// 		Distro:  runner.Ubuntu,
 	// 		Version: "22.04",
 	// 	},
 	// 	Provider:     Google,

pkg/testing/runner/supported.go

@@ -31,6 +31,16 @@ type SupportedOS struct {
 }
 
 var (
+	// UbuntuAMD64_2404 - Ubuntu (amd64) 24.04
+	UbuntuAMD64_2404 = SupportedOS{
+		OS: define.OS{
+			Type:    define.Linux,
+			Arch:    define.AMD64,
+			Distro:  Ubuntu,
+			Version: "24.04",
+		},
+		Runner: DebianRunner{},
+	}
 	// UbuntuAMD64_2204 - Ubuntu (amd64) 22.04
 	UbuntuAMD64_2204 = SupportedOS{
 		OS: define.OS{
@@ -51,6 +61,16 @@ var (
 		},
 		Runner: DebianRunner{},
 	}
+	// UbuntuARM64_2404 - Ubuntu (arm64) 24.04
+	UbuntuARM64_2404 = SupportedOS{
+		OS: define.OS{
+			Type:    define.Linux,
+			Arch:    define.ARM64,
+			Distro:  Ubuntu,
+			Version: "24.04",
+		},
+		Runner: DebianRunner{},
+	}
 	// UbuntuARM64_2204 - Ubuntu (arm64) 22.04
 	UbuntuARM64_2204 = SupportedOS{
 		OS: define.OS{
@@ -146,8 +166,10 @@ var (
 // one in this list will be picked. So it's best to place the one that we want the
 // most testing at the top.
 var supported = []SupportedOS{
+	UbuntuAMD64_2404,
 	UbuntuAMD64_2204,
 	UbuntuAMD64_2004,
+	UbuntuARM64_2404,
 	UbuntuARM64_2204,
 	UbuntuARM64_2004,
 	RhelAMD64_8,

pkg/testing/runner/supported_test.go

@@ -37,6 +37,7 @@ func TestGetSupported(t *testing.T) {
 				Distro: Ubuntu,
 			},
 			Results: []SupportedOS{
+				UbuntuAMD64_2404,
 				UbuntuAMD64_2204,
 				UbuntuAMD64_2004,
 			},