Skip to content

Support ubuntu 26 and update installer test to test on it, temporary disable ubuntu 24 #55600

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

Draft
KevinFairise2 wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Support ubuntu 26 and update installer test to test on it, temporary disable ubuntu 24 #55600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7b35bb0
Support ubuntu 26 and update installer test to test on it, temporary …
KevinFairise2 Aug 28, 2026
a5a5568
Update platform tests as well
KevinFairise2 Aug 28, 2026
cfd17d3
Enable AppArmor ubuntu 26
KevinFairise2 Aug 28, 2026
700f0e9
Fix AMI
KevinFairise2 Aug 28, 2026
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 .gitlab/test/e2e_install_packages/ubuntu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

.new-e2e_ubuntu_a7_arm64:
variables:
E2E_DESCRIPTORS: "ubuntu/arm64/18-04,ubuntu/arm64/20-04,ubuntu/arm64/24-04"
E2E_DESCRIPTORS: "ubuntu/arm64/18-04,ubuntu/arm64/20-04,ubuntu/arm64/26-04"
E2E_CWS_SUPPORTED_DESCRIPTORS: "ubuntu/arm64/18-04,ubuntu/arm64/20-04"
E2E_BRANCH_DESCRIPTORS: "ubuntu/arm64/20-04"
needs:
Expand Down
1 change: 1 addition & 0 deletions test/e2e-framework/components/os/linux_descriptors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ package os
var (
UbuntuDefault = Ubuntu2204E2E
Ubuntu2404 = NewDescriptor(Ubuntu, "24-04")
Ubuntu2604 = NewDescriptor(Ubuntu, "26-04")
Ubuntu2204 = NewDescriptor(Ubuntu, "22-04")
Ubuntu2004 = NewDescriptor(Ubuntu, "20-04")
Ubuntu2204E2E = NewDescriptor(Ubuntu, "22-04-e2e")
Expand Down
5 changes: 3 additions & 2 deletions test/e2e-framework/resources/aws/platforms.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,8 @@
"23-04": "ami-0a20fb27318b71251",
"23-10": "ami-0dea732dd5f1da0a8",
"24-04": "ami-09ffc2931cd758420",
"24-04-e2e": "ami-0c95652dce879b6c6"
"24-04-e2e": "ami-0c95652dce879b6c6",
"26-04": "ami-080eeae1aeff72cbc"
},
"x86_64": {
"14-04": "ami-013d633d3b6cdb22c",
Expand All @@ -133,4 +134,4 @@
"2025": "ami-0d03f0a2f81ced53e"
}
}
}
}
6 changes: 4 additions & 2 deletions test/new-e2e/tests/installer/unix/all_packages_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@ import (
"testing"
"time"

"github.com/stretchr/testify/require"

e2eos "github.com/DataDog/datadog-agent/test/e2e-framework/components/os"
"github.com/DataDog/datadog-agent/test/e2e-framework/scenarios/aws/ec2"
"github.com/stretchr/testify/require"

"github.com/DataDog/datadog-agent/test/e2e-framework/testing/e2e"
"github.com/DataDog/datadog-agent/test/e2e-framework/testing/environments"
Expand Down Expand Up @@ -44,7 +45,8 @@ var (
e2eos.Suse15,
}
arm64Flavors = []e2eos.Descriptor{
e2eos.Ubuntu2404,
e2eos.Ubuntu2604,

@github-actions github-actions Bot Aug 28, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[P2] Update the AppArmor guards for Ubuntu 26.04. package_apm_inject_test.go only recognizes Ubuntu2404 and Debian 12 as AppArmor-enabled, so replacing the ARM64 flavor here causes TestAppArmor to skip and omits the profile assertions in install/uninstrument tests on the new target. Include Ubuntu 26.04 in those checks (ideally via a capability helper).

// e2eos.Ubuntu2404, A bug in APT causes some apt update calls to timeout with unstable mirrors: https://bugs.launchpad.net/ubuntu/+source/apt/+bug/2003851
e2eos.AmazonLinux2,
e2eos.Suse15,
}
Expand Down
5 changes: 3 additions & 2 deletions test/new-e2e/tests/installer/unix/package_apm_inject_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,11 @@ import (
"strings"
"time"

e2eos "github.com/DataDog/datadog-agent/test/e2e-framework/components/os"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.yaml.in/yaml/v3"

e2eos "github.com/DataDog/datadog-agent/test/e2e-framework/components/os"
)

const (
Expand Down Expand Up @@ -460,7 +461,7 @@ func (s *packageApmInjectSuite) TestInstallWithUmask() {
}

func (s *packageApmInjectSuite) TestAppArmor() {
if s.os != e2eos.Ubuntu2404 && s.os != e2eos.Debian12 {
if s.os != e2eos.Ubuntu2404 && s.os != e2eos.Debian12 && s.os != e2eos.Ubuntu2604 {
s.T().Skip("AppArmor not installed by default")
}
assert.Contains(s.T(), s.Env().RemoteHost.MustExecute("sudo aa-enabled"), "Yes")
Expand Down
Loading