From b0212d3ce50243cf57bd476a8b9f49f73c44f4f6 Mon Sep 17 00:00:00 2001 From: "nicolas.schweitzer" Date: Thu, 17 Sep 2026 16:21:16 +0000 Subject: [PATCH 1/2] fix(e2e): converge Amazon Linux 2 AMI with its batteries-included -e2e variant Repoints the default Amazon Linux 2 AMI in platforms.json to the batteries-included image built by ami-builder (docker, jq, ansible, awscli pre-installed), instead of keeping the "2-e2e" AMI unused. The "2-e2e" entries were referenced by no Go const and no CI descriptor string anywhere in the repo. Environment: Datadog workspace Co-Authored-By: Claude Sonnet 5 noreply@anthropic.com --- test/e2e-framework/resources/aws/platforms.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e-framework/resources/aws/platforms.json b/test/e2e-framework/resources/aws/platforms.json index 127078607f48..f42655fb42fe 100644 --- a/test/e2e-framework/resources/aws/platforms.json +++ b/test/e2e-framework/resources/aws/platforms.json @@ -1,13 +1,13 @@ { "amazon-linux": { "arm64": { - "2": "ami-0a37ff68b81b844bb", + "2": "ami-014a2929b68fa9931", "2-5-10": "ami-09e51988f56677f44", "2022-5-15": "ami-0acc51c3357f26240", "2023": "ami-04c4a14c3eeb37669" }, "x86_64": { - "2": "ami-09e48b5e3f7502ead", + "2": "ami-00a582e65ca9fb5d3", "2-5-10": "ami-06a0cd9728546d178", "2022-5-15": "ami-0f0f00c2d082c52ae", "2023": "ami-0de5c3ecd5a9c7c7b" From 808850c2ee4abbc0cd90a36c32e36a8babf943a8 Mon Sep 17 00:00:00 2001 From: "nicolas.schweitzer" Date: Thu, 17 Sep 2026 16:50:16 +0000 Subject: [PATCH 2/2] fix(e2e): remove dead AmazonLinux branch from installAnsible RunInstallScript skips InstallMethodAnsible for AmazonLinux2 before installAnsible is ever called, and no flavor list anywhere in the repo uses AmazonLinux2023. The AmazonLinux case in installAnsible's switch was therefore unreachable; RedHat9 is the only flavor that ever executes it. Environment: Datadog workspace Co-Authored-By: Claude Sonnet 5 noreply@anthropic.com --- test/new-e2e/tests/installer/unix/all_packages_test.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/new-e2e/tests/installer/unix/all_packages_test.go b/test/new-e2e/tests/installer/unix/all_packages_test.go index 6cfda44fca8b..56446f224874 100644 --- a/test/new-e2e/tests/installer/unix/all_packages_test.go +++ b/test/new-e2e/tests/installer/unix/all_packages_test.go @@ -376,7 +376,9 @@ func (s *packageBaseSuite) installAnsible(flavor e2eos.Descriptor) string { s.Env().RemoteHost.MustExecute("curl https://bootstrap.pypa.io/pip/3.6/get-pip.py -o get-pip.py && python3 get-pip.py && rm get-pip.py") s.Env().RemoteHost.MustExecute("python3 -m pip install ansible") pathPrefix = "/home/centos/.local/bin/" - case e2eos.AmazonLinux, e2eos.RedHat: + // AmazonLinux is deliberately absent here: RunInstallScript skips InstallMethodAnsible + // for AmazonLinux2 before this is ever called, and no flavor list uses AmazonLinux2023. + case e2eos.RedHat: s.Env().RemoteHost.MustExecute("sudo yum install -y python3.14 python3.14-pip && yes | pip3.14 install ansible") pathPrefix = "/home/ec2-user/.local/bin/" case e2eos.Suse: