Skip to content

fix(e2e): converge Amazon Linux 2 AMI with its batteries-included -e2e variant #56537

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

Merged
gh-worker-dd-mergequeue-cf854d merged 2 commits into from
Sep 23, 2026
+5 −3
Merged

fix(e2e): converge Amazon Linux 2 AMI with its batteries-included -e2e variant #56537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0212d3
fix(e2e): converge Amazon Linux 2 AMI with its batteries-included -e2…
chouetz Sep 17, 2026
808850c
fix(e2e): remove dead AmazonLinux branch from installAnsible
chouetz Sep 17, 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
4 changes: 2 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
@@ -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"
Expand Down
4 changes: 3 additions & 1 deletion 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 @@ -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:
Expand Down
Loading