Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Ubuntu 24.04 to integration testing. #4898

Merged
merged 3 commits into from
Jun 11, 2024
Merged

Add Ubuntu 24.04 to integration testing. #4898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f05723
Add Ubuntu 24.04 to integration testing.
blakerouse Jun 10, 2024
083b711
Fix unit test.
blakerouse Jun 10, 2024
a3c4086
Add -amd64 to end.
blakerouse Jun 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/testing/multipass/provisioner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
26 changes: 26 additions & 0 deletions pkg/testing/ogc/supported.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
22 changes: 22 additions & 0 deletions pkg/testing/runner/supported.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand All @@ -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{
Expand Down Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions pkg/testing/runner/supported_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ func TestGetSupported(t *testing.T) {
Distro: Ubuntu,
},
Results: []SupportedOS{
UbuntuAMD64_2404,
UbuntuAMD64_2204,
UbuntuAMD64_2004,
},
Expand Down