diff --git a/enos/enos-dynamic-config.hcl b/enos/enos-dynamic-config.hcl index 3dd40e751c..300f48286a 100644 --- a/enos/enos-dynamic-config.hcl +++ b/enos/enos-dynamic-config.hcl @@ -13,7 +13,7 @@ globals { distro_version_amzn = ["2023"] distro_version_rhel = ["8.10", "9.7", "10.1"] distro_version_sles = ["15.7", "16.0"] - distro_version_ubuntu = ["22.04", "24.04"] - upgrade_initial_version = ["1.19.0", "1.19.1", "1.19.2", "1.19.3", "1.19.4", "1.19.5", "1.20.0-rc1", "1.20.0-rc2", "1.20.0", "1.20.1", "1.20.2", "1.20.3", "1.20.4", "1.21.0-rc1", "1.21.0", "1.21.1", "1.21.2", "1.21.3", "1.21.4"] + distro_version_ubuntu = ["22.04", "24.04", "26.04"] + upgrade_initial_version = ["1.20.0", "1.20.1", "1.20.2", "1.20.3", "1.20.4", "1.20.5", "1.20.6", "1.20.7", "1.20.8", "1.20.9", "1.20.10", "1.21.0-rc1", "1.21.0", "1.21.1", "1.21.2", "1.21.3", "1.21.4", "1.21.5", "2.0.0-rc1", "2.0.0"] } } diff --git a/enos/enos-dynamic-config.tmpl b/enos/enos-dynamic-config.tmpl index 0efde4e471..33e4c62202 100644 --- a/enos/enos-dynamic-config.tmpl +++ b/enos/enos-dynamic-config.tmpl @@ -13,7 +13,7 @@ globals { distro_version_amzn = ["2023"] distro_version_rhel = ["8.10", "9.7", "10.1"] distro_version_sles = ["15.7", "16.0"] - distro_version_ubuntu = ["22.04", "24.04"] + distro_version_ubuntu = ["22.04", "24.04", "26.04"] upgrade_initial_version = [{{- $versions := VersionsNMinusTransition "vault" .Edition .Version 3 "major" "1.21.5" "minor" }}{{- range $i, $v := $versions }}{{if $i}}, {{end}}"{{ $v }}"{{- end }}] } } diff --git a/enos/enos-globals.hcl b/enos/enos-globals.hcl index 74201ef339..753920bd96 100644 --- a/enos/enos-globals.hcl +++ b/enos/enos-globals.hcl @@ -43,6 +43,7 @@ globals { ubuntu = { "22.04" = ["netcat", "ldap-utils"] "24.04" = ["netcat-openbsd", "ldap-utils"] + "26.04" = ["netcat-openbsd", "ldap-utils"] } } distro_version = { diff --git a/enos/enos-scenario-agent.hcl b/enos/enos-scenario-agent.hcl index f0155e13af..9c6097cff6 100644 --- a/enos/enos-scenario-agent.hcl +++ b/enos/enos-scenario-agent.hcl @@ -178,7 +178,7 @@ scenario "agent" { } variables { - ami_id = step.ec2_info.ami_ids["arm64"]["ubuntu"]["24.04"] + ami_id = step.ec2_info.ami_ids["arm64"]["ubuntu"]["26.04"] cluster_tag_key = global.vault_tag_key common_tags = global.tags instance_count = 1 @@ -237,7 +237,7 @@ scenario "agent" { variables { hosts = step.create_external_integration_target.hosts ip_version = matrix.ip_version - packages = concat(global.packages, global.distro_packages["ubuntu"]["24.04"], ["podman", "podman-docker"]) + packages = concat(global.packages, global.distro_packages["ubuntu"]["26.04"], ["podman", "podman-docker"]) ports = global.integration_host_ports } } diff --git a/enos/enos-scenario-autopilot.hcl b/enos/enos-scenario-autopilot.hcl index 50e65a3322..43734f395d 100644 --- a/enos/enos-scenario-autopilot.hcl +++ b/enos/enos-scenario-autopilot.hcl @@ -175,7 +175,7 @@ scenario "autopilot" { } variables { - ami_id = step.ec2_info.ami_ids["arm64"]["ubuntu"]["24.04"] + ami_id = step.ec2_info.ami_ids["arm64"]["ubuntu"]["26.04"] cluster_tag_key = global.vault_tag_key common_tags = global.tags instance_count = 1 @@ -237,7 +237,7 @@ scenario "autopilot" { variables { hosts = step.create_external_integration_target.hosts ip_version = matrix.ip_version - packages = concat(global.packages, global.distro_packages["ubuntu"]["24.04"], ["podman", "podman-docker"]) + packages = concat(global.packages, global.distro_packages["ubuntu"]["26.04"], ["podman", "podman-docker"]) ports = global.integration_host_ports } } diff --git a/enos/enos-scenario-dr-replication.hcl b/enos/enos-scenario-dr-replication.hcl index 6c8456ce6a..d2325d9d6d 100644 --- a/enos/enos-scenario-dr-replication.hcl +++ b/enos/enos-scenario-dr-replication.hcl @@ -218,7 +218,7 @@ scenario "dr_replication" { } variables { - ami_id = step.ec2_info.ami_ids["arm64"]["ubuntu"]["24.04"] + ami_id = step.ec2_info.ami_ids["arm64"]["ubuntu"]["26.04"] cluster_tag_key = global.vault_tag_key common_tags = global.tags instance_count = 1 @@ -318,7 +318,7 @@ scenario "dr_replication" { variables { hosts = step.create_external_integration_target.hosts ip_version = matrix.ip_version - packages = concat(global.packages, global.distro_packages["ubuntu"]["24.04"], ["podman", "podman-docker"]) + packages = concat(global.packages, global.distro_packages["ubuntu"]["26.04"], ["podman", "podman-docker"]) ports = global.integration_host_ports } } diff --git a/enos/enos-scenario-plugin.hcl b/enos/enos-scenario-plugin.hcl index aa89af41b9..0a8e033c15 100644 --- a/enos/enos-scenario-plugin.hcl +++ b/enos/enos-scenario-plugin.hcl @@ -178,7 +178,7 @@ scenario "plugin" { } variables { - ami_id = step.ec2_info.ami_ids["arm64"]["ubuntu"]["24.04"] + ami_id = step.ec2_info.ami_ids["arm64"]["ubuntu"]["26.04"] cluster_tag_key = "plugin-integration" common_tags = global.tags instance_count = 1 @@ -237,7 +237,7 @@ scenario "plugin" { variables { hosts = step.create_plugin_integration_target.hosts ip_version = matrix.ip_version - packages = concat(global.packages, global.distro_packages["ubuntu"]["24.04"], ["podman", "podman-docker"]) + packages = concat(global.packages, global.distro_packages["ubuntu"]["26.04"], ["podman", "podman-docker"]) ports = global.integration_host_ports database_configs = global.database_configs } diff --git a/enos/enos-scenario-pr-replication.hcl b/enos/enos-scenario-pr-replication.hcl index 7972e5f385..0dcc6d6478 100644 --- a/enos/enos-scenario-pr-replication.hcl +++ b/enos/enos-scenario-pr-replication.hcl @@ -218,7 +218,7 @@ scenario "pr_replication" { } variables { - ami_id = step.ec2_info.ami_ids["arm64"]["ubuntu"]["24.04"] + ami_id = step.ec2_info.ami_ids["arm64"]["ubuntu"]["26.04"] cluster_tag_key = global.vault_tag_key common_tags = global.tags instance_count = 1 @@ -340,7 +340,7 @@ scenario "pr_replication" { variables { hosts = step.create_external_integration_target.hosts ip_version = matrix.ip_version - packages = concat(global.packages, global.distro_packages["ubuntu"]["24.04"], ["podman", "podman-docker"]) + packages = concat(global.packages, global.distro_packages["ubuntu"]["26.04"], ["podman", "podman-docker"]) ports = global.integration_host_ports } } diff --git a/enos/enos-scenario-proxy.hcl b/enos/enos-scenario-proxy.hcl index 0d14d5028a..532ea337a9 100644 --- a/enos/enos-scenario-proxy.hcl +++ b/enos/enos-scenario-proxy.hcl @@ -185,7 +185,7 @@ scenario "proxy" { } variables { - ami_id = step.ec2_info.ami_ids["arm64"]["ubuntu"]["24.04"] + ami_id = step.ec2_info.ami_ids["arm64"]["ubuntu"]["26.04"] cluster_tag_key = global.vault_tag_key common_tags = global.tags instance_count = 1 @@ -244,7 +244,7 @@ scenario "proxy" { variables { hosts = step.create_external_integration_target.hosts ip_version = matrix.ip_version - packages = concat(global.packages, global.distro_packages["ubuntu"]["24.04"], ["podman", "podman-docker"]) + packages = concat(global.packages, global.distro_packages["ubuntu"]["26.04"], ["podman", "podman-docker"]) ports = global.integration_host_ports } } diff --git a/enos/enos-scenario-seal-ha.hcl b/enos/enos-scenario-seal-ha.hcl index 492f85a156..460c744bb0 100644 --- a/enos/enos-scenario-seal-ha.hcl +++ b/enos/enos-scenario-seal-ha.hcl @@ -217,7 +217,7 @@ scenario "seal_ha" { } variables { - ami_id = step.ec2_info.ami_ids["arm64"]["ubuntu"]["24.04"] + ami_id = step.ec2_info.ami_ids["arm64"]["ubuntu"]["26.04"] cluster_tag_key = global.vault_tag_key common_tags = global.tags instance_count = 1 @@ -276,7 +276,7 @@ scenario "seal_ha" { variables { hosts = step.create_external_integration_target.hosts ip_version = matrix.ip_version - packages = concat(global.packages, global.distro_packages["ubuntu"]["24.04"], ["podman", "podman-docker"]) + packages = concat(global.packages, global.distro_packages["ubuntu"]["26.04"], ["podman", "podman-docker"]) ports = global.integration_host_ports } } diff --git a/enos/enos-scenario-smoke-sdk.hcl b/enos/enos-scenario-smoke-sdk.hcl index 38b7224c0d..25d7de073c 100644 --- a/enos/enos-scenario-smoke-sdk.hcl +++ b/enos/enos-scenario-smoke-sdk.hcl @@ -178,7 +178,7 @@ scenario "smoke_sdk" { } variables { - ami_id = step.ec2_info.ami_ids["arm64"]["ubuntu"]["24.04"] + ami_id = step.ec2_info.ami_ids["arm64"]["ubuntu"]["26.04"] cluster_tag_key = global.vault_tag_key common_tags = global.tags instance_count = 1 @@ -237,7 +237,7 @@ scenario "smoke_sdk" { variables { hosts = step.create_external_integration_target.hosts ip_version = matrix.ip_version - packages = concat(global.packages, global.distro_packages["ubuntu"]["24.04"], ["podman", "podman-docker"]) + packages = concat(global.packages, global.distro_packages["ubuntu"]["26.04"], ["podman", "podman-docker"]) ports = global.integration_host_ports } } diff --git a/enos/enos-scenario-smoke.hcl b/enos/enos-scenario-smoke.hcl index 7b48a449e8..4eb233a900 100644 --- a/enos/enos-scenario-smoke.hcl +++ b/enos/enos-scenario-smoke.hcl @@ -175,7 +175,7 @@ scenario "smoke" { } variables { - ami_id = step.ec2_info.ami_ids["arm64"]["ubuntu"]["24.04"] + ami_id = step.ec2_info.ami_ids["arm64"]["ubuntu"]["26.04"] cluster_tag_key = global.vault_tag_key common_tags = global.tags instance_count = 1 @@ -234,7 +234,7 @@ scenario "smoke" { variables { hosts = step.create_external_integration_target.hosts ip_version = matrix.ip_version - packages = concat(global.packages, global.distro_packages["ubuntu"]["24.04"], ["podman", "podman-docker"]) + packages = concat(global.packages, global.distro_packages["ubuntu"]["26.04"], ["podman", "podman-docker"]) ports = global.integration_host_ports } } diff --git a/enos/enos-scenario-upgrade.hcl b/enos/enos-scenario-upgrade.hcl index 5c75ff3bec..e4e3795e1c 100644 --- a/enos/enos-scenario-upgrade.hcl +++ b/enos/enos-scenario-upgrade.hcl @@ -192,7 +192,7 @@ scenario "upgrade" { } variables { - ami_id = step.ec2_info.ami_ids["arm64"]["ubuntu"]["24.04"] + ami_id = step.ec2_info.ami_ids["arm64"]["ubuntu"]["26.04"] cluster_tag_key = global.vault_tag_key common_tags = global.tags instance_count = 1 @@ -251,7 +251,7 @@ scenario "upgrade" { variables { hosts = step.create_external_integration_target.hosts ip_version = matrix.ip_version - packages = concat(global.packages, global.distro_packages["ubuntu"]["24.04"], ["podman", "podman-docker"]) + packages = concat(global.packages, global.distro_packages["ubuntu"]["26.04"], ["podman", "podman-docker"]) ports = global.integration_host_ports } } diff --git a/enos/enos-variables.hcl b/enos/enos-variables.hcl index 449f29cbab..3943309aaf 100644 --- a/enos/enos-variables.hcl +++ b/enos/enos-variables.hcl @@ -89,7 +89,7 @@ variable "distro_version_sles" { variable "distro_version_ubuntu" { description = "The version of Ubuntu Linux to use" type = string - default = "24.04" // or "22.04" + default = "26.04" // or "22.04" or "24.04" } variable "project_name" { diff --git a/enos/enos.vars.hcl b/enos/enos.vars.hcl index ada3ca0147..f4704ea1f8 100644 --- a/enos/enos.vars.hcl +++ b/enos/enos.vars.hcl @@ -44,7 +44,7 @@ // distro_version_sles = "16.0" // or "15.7" // distro_version_ubuntu is the version of ubuntu to use for "distro:ubuntu" variants -// distro_version_ubuntu = "22.04" // or "24.04" +// distro_version_ubuntu = "22.04" // or "26.04" // tags are a map of tags that will be applied to infrastructure resources that // support tagging. diff --git a/enos/modules/artifact/metadata/main.tf b/enos/modules/artifact/metadata/main.tf index 6c6d3a1acb..575649c198 100644 --- a/enos/modules/artifact/metadata/main.tf +++ b/enos/modules/artifact/metadata/main.tf @@ -157,6 +157,7 @@ locals { ubuntu = { "22.04" = local.release_path_deb, "24.04" = local.release_path_deb, + "26.04" = local.release_path_deb, } } release_paths = local.release_path_distro[var.distro] diff --git a/enos/modules/ec2_info/main.tf b/enos/modules/ec2_info/main.tf index 576c7da26d..73fc0dc1ab 100644 --- a/enos/modules/ec2_info/main.tf +++ b/enos/modules/ec2_info/main.tf @@ -27,6 +27,7 @@ locals { "ubuntu" = { "22.04" = data.aws_ami.ubuntu_2204["arm64"].id "24.04" = data.aws_ami.ubuntu_2404["arm64"].id + "26.04" = data.aws_ami.ubuntu_2604["arm64"].id } } "amd64" = { @@ -46,6 +47,7 @@ locals { "ubuntu" = { "22.04" = data.aws_ami.ubuntu_2204["x86_64"].id "24.04" = data.aws_ami.ubuntu_2404["x86_64"].id + "26.04" = data.aws_ami.ubuntu_2604["x86_64"].id } } } @@ -229,6 +231,28 @@ data "aws_ami" "ubuntu_2404" { owners = [local.canonical_owner_id] } +data "aws_ami" "ubuntu_2604" { + most_recent = true + for_each = local.architectures + + filter { + name = "name" + values = ["ubuntu/images/hvm-ssd-gp3/ubuntu-resolute-26.04-*-server-*"] + } + + filter { + name = "virtualization-type" + values = ["hvm"] + } + + filter { + name = "architecture" + values = [each.value] + } + + owners = [local.canonical_owner_id] +} + data "aws_region" "current" {} data "aws_availability_zones" "available" { diff --git a/enos/modules/softhsm_install/main.tf b/enos/modules/softhsm_install/main.tf index 80278d1ac0..76be102c22 100644 --- a/enos/modules/softhsm_install/main.tf +++ b/enos/modules/softhsm_install/main.tf @@ -51,6 +51,7 @@ locals { ubuntu = { "22.04" = ["softhsm", "opensc"] "24.04" = ["softhsm2", "opensc"] + "26.04" = ["softhsm2", "opensc"] } } : { amzn = { @@ -64,6 +65,7 @@ locals { ubuntu = { "22.04" = ["softhsm"] "24.04" = ["softhsm2"] + "26.04" = ["softhsm2"] } } }