From b8727af84a34e5e0df0a1a46be7d211b0abb41b1 Mon Sep 17 00:00:00 2001 From: hc-github-team-secure-boundary <82989682+hc-github-team-secure-boundary@users.noreply.github.com> Date: Fri, 20 Mar 2026 19:45:56 +0530 Subject: [PATCH] backport of commit 00ffef1e907a15f8f40850928925096c308d1c2e (#6510) Co-authored-by: Michael Li --- enos/modules/aws_vpc/main.tf | 10 +++++++--- enos/modules/aws_vpc_ipv6/main.tf | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/enos/modules/aws_vpc/main.tf b/enos/modules/aws_vpc/main.tf index 60ae67d6db..ca11c36fb8 100644 --- a/enos/modules/aws_vpc/main.tf +++ b/enos/modules/aws_vpc/main.tf @@ -70,10 +70,14 @@ data "aws_ami" "ubuntu" { most_recent = true count = length(local.architecture_filters) - # Currently latest LTS-1 filter { name = "name" - values = ["ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-*-server-*"] + values = ["hc-base-ubuntu-2404-*"] + } + + filter { + name = "state" + values = ["available"] } filter { @@ -86,7 +90,7 @@ data "aws_ami" "ubuntu" { values = [local.architecture_filters[count.index]] } - owners = ["099720109477"] # Canonical + owners = ["888995627335"] # ami-prod account } data "aws_ami" "rhel" { diff --git a/enos/modules/aws_vpc_ipv6/main.tf b/enos/modules/aws_vpc_ipv6/main.tf index f34496f3f3..d36e228b7e 100644 --- a/enos/modules/aws_vpc_ipv6/main.tf +++ b/enos/modules/aws_vpc_ipv6/main.tf @@ -107,10 +107,14 @@ data "aws_ami" "ubuntu" { most_recent = true count = length(local.architecture_filters) - # Currently latest LTS-1 filter { name = "name" - values = ["ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-*-server-*"] + values = ["hc-base-ubuntu-2204-*"] + } + + filter { + name = "state" + values = ["available"] } filter { @@ -123,7 +127,7 @@ data "aws_ami" "ubuntu" { values = [local.architecture_filters[count.index]] } - owners = ["099720109477"] # Canonical + owners = ["888995627335"] # ami-prod account } data "aws_ami" "rhel" {