From b76a28a1e0b59963c304620bc4fe0dba39df4829 Mon Sep 17 00:00:00 2001 From: Ryan Cragun Date: Tue, 12 Aug 2025 15:51:30 -0600 Subject: [PATCH] [VAULT-38883] enos: remove Ubuntu 20.04 from the test matrix (#31482) Ubunut 20.04 is EOL. Per our support and package policies we no longer need to develop or test for that platform. Signed-off-by: Ryan Cragun --- enos/enos-dynamic-config.hcl | 4 ++-- enos/enos-globals.hcl | 1 - enos/enos-variables.hcl | 2 +- enos/enos.vars.hcl | 2 +- enos/modules/artifact/metadata/main.tf | 1 - enos/modules/ec2_info/main.tf | 24 ------------------- enos/modules/softhsm_install/main.tf | 2 -- .../pkg/generate/enos_dynamic_config.go | 2 +- .../pkg/generate/enos_dynamic_config_test.go | 4 ++-- 9 files changed, 7 insertions(+), 35 deletions(-) diff --git a/enos/enos-dynamic-config.hcl b/enos/enos-dynamic-config.hcl index 15f7de6dc4..adc631e0c8 100644 --- a/enos/enos-dynamic-config.hcl +++ b/enos/enos-dynamic-config.hcl @@ -14,7 +14,7 @@ globals { distro_version_leap = ["15.6"] distro_version_rhel = ["8.10", "9.5"] distro_version_sles = ["15.6"] - distro_version_ubuntu = ["20.04", "24.04"] - upgrade_initial_version = ["1.17.0", "1.17.1", "1.17.2", "1.17.3", "1.17.4", "1.17.5", "1.17.6", "1.18.0-rc1", "1.18.0", "1.18.1", "1.18.2", "1.18.3", "1.18.4", "1.18.5", "1.19.0-rc1", "1.19.0", "1.19.1", "1.19.2"] + distro_version_ubuntu = ["22.04", "24.04"] + upgrade_initial_version = ["1.18.0", "1.18.1", "1.18.2", "1.18.3", "1.18.4", "1.18.5", "1.18.6", "1.18.7", "1.18.8", "1.18.9", "1.18.10", "1.18.11", "1.18.12", "1.18.13", "1.19.0", "1.19.1", "1.19.2", "1.19.3", "1.19.4", "1.19.5", "1.19.6", "1.19.7", "1.19.8", "1.20.0", "1.20.1", "1.20.2"] } } diff --git a/enos/enos-globals.hcl b/enos/enos-globals.hcl index 37578f8b37..3d26cae647 100644 --- a/enos/enos-globals.hcl +++ b/enos/enos-globals.hcl @@ -39,7 +39,6 @@ globals { "15.6" = ["netcat-openbsd", "openssl", "openldap2-client"] } ubuntu = { - "20.04" = ["netcat", "ldap-utils"] "22.04" = ["netcat", "ldap-utils"] "24.04" = ["netcat-openbsd", "ldap-utils"] } diff --git a/enos/enos-variables.hcl b/enos/enos-variables.hcl index 4757f3455c..fff6a93f9e 100644 --- a/enos/enos-variables.hcl +++ b/enos/enos-variables.hcl @@ -95,7 +95,7 @@ variable "distro_version_sles" { variable "distro_version_ubuntu" { description = "The version of ubuntu to use" type = string - default = "24.04" // or "20.04", "22.04" + default = "24.04" // or "22.04" } variable "tags" { diff --git a/enos/enos.vars.hcl b/enos/enos.vars.hcl index ad19a217a5..30b8d2f676 100644 --- a/enos/enos.vars.hcl +++ b/enos/enos.vars.hcl @@ -47,7 +47,7 @@ // distro_version_sles = "v15_sp5_standard" // distro_version_ubuntu is the version of ubuntu to use for "distro:ubuntu" variants -// distro_version_ubuntu = "22.04" // or "20.04" +// distro_version_ubuntu = "22.04" // or "24.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 111ed3a614..70caa59b45 100644 --- a/enos/modules/artifact/metadata/main.tf +++ b/enos/modules/artifact/metadata/main.tf @@ -158,7 +158,6 @@ locals { "15.6" = "RHEL/9/${local.release_sub_path_rpm}" } ubuntu = { - "20.04" = local.release_path_deb, "22.04" = local.release_path_deb, "24.04" = local.release_path_deb, } diff --git a/enos/modules/ec2_info/main.tf b/enos/modules/ec2_info/main.tf index 12fecf0fce..c4425ff6a5 100644 --- a/enos/modules/ec2_info/main.tf +++ b/enos/modules/ec2_info/main.tf @@ -33,7 +33,6 @@ locals { "15.6" = data.aws_ami.sles_15["arm64"].id } "ubuntu" = { - "20.04" = data.aws_ami.ubuntu_2004["arm64"].id "22.04" = data.aws_ami.ubuntu_2204["arm64"].id "24.04" = data.aws_ami.ubuntu_2404["arm64"].id } @@ -54,7 +53,6 @@ locals { "15.6" = data.aws_ami.sles_15["x86_64"].id } "ubuntu" = { - "20.04" = data.aws_ami.ubuntu_2004["x86_64"].id "22.04" = data.aws_ami.ubuntu_2204["x86_64"].id "24.04" = data.aws_ami.ubuntu_2404["x86_64"].id } @@ -174,28 +172,6 @@ data "aws_ami" "sles_15" { owners = [local.suse_owner_id] } -data "aws_ami" "ubuntu_2004" { - most_recent = true - for_each = local.architectures - - filter { - name = "name" - values = ["ubuntu/images/hvm-ssd/ubuntu-*-20.04-*-server-*"] - } - - filter { - name = "virtualization-type" - values = ["hvm"] - } - - filter { - name = "architecture" - values = [each.value] - } - - owners = [local.canonical_owner_id] -} - data "aws_ami" "ubuntu_2204" { most_recent = true for_each = local.architectures diff --git a/enos/modules/softhsm_install/main.tf b/enos/modules/softhsm_install/main.tf index ff0f497eea..3b1840acc8 100644 --- a/enos/modules/softhsm_install/main.tf +++ b/enos/modules/softhsm_install/main.tf @@ -47,7 +47,6 @@ locals { "9.5" = ["softhsm", "opensc"] } ubuntu = { - "20.04" = ["softhsm", "opensc"] "22.04" = ["softhsm", "opensc"] "24.04" = ["softhsm2", "opensc"] } @@ -60,7 +59,6 @@ locals { "9.5" = ["softhsm"] } ubuntu = { - "20.04" = ["softhsm"] "22.04" = ["softhsm"] "24.04" = ["softhsm2"] } diff --git a/tools/pipeline/internal/pkg/generate/enos_dynamic_config.go b/tools/pipeline/internal/pkg/generate/enos_dynamic_config.go index 678e98161f..52d077cbcf 100644 --- a/tools/pipeline/internal/pkg/generate/enos_dynamic_config.go +++ b/tools/pipeline/internal/pkg/generate/enos_dynamic_config.go @@ -137,7 +137,7 @@ func (e *EnosDynamicConfigReq) getSampleAttrs(ctx context.Context) (*SampleAttrs DistroVersionLeap: []string{"15.6"}, DistroVersionRhel: []string{"8.10", "9.5"}, DistroVersionSles: []string{"15.6"}, - DistroVersionUbuntu: []string{"20.04", "24.04"}, + DistroVersionUbuntu: []string{"22.04", "24.04"}, } // Create our initial upgrade version list. We'll find all released versions between N-3 -> Current diff --git a/tools/pipeline/internal/pkg/generate/enos_dynamic_config_test.go b/tools/pipeline/internal/pkg/generate/enos_dynamic_config_test.go index cf6c63224f..b3d0638a04 100644 --- a/tools/pipeline/internal/pkg/generate/enos_dynamic_config_test.go +++ b/tools/pipeline/internal/pkg/generate/enos_dynamic_config_test.go @@ -232,7 +232,7 @@ func Test_EnosDynamicConfigReq_Run(t *testing.T) { DistroVersionLeap: []string{"15.6"}, DistroVersionRhel: []string{"8.10", "9.5"}, DistroVersionSles: []string{"15.6"}, - DistroVersionUbuntu: []string{"20.04", "24.04"}, + DistroVersionUbuntu: []string{"22.04", "24.04"}, UpgradeInitialVersion: versions, }, }, @@ -254,7 +254,7 @@ globals { distro_version_leap = ["15.6"] distro_version_rhel = ["8.10", "9.5"] distro_version_sles = ["15.6"] - distro_version_ubuntu = ["20.04", "24.04"] + distro_version_ubuntu = ["22.04", "24.04"] upgrade_initial_version = ["1.16.6", "1.16.7", "1.16.8", "1.16.9", "1.16.10", "1.17.3", "1.17.4", "1.17.6", "1.18.0-rc1"] } }