mirror of
https://github.com/hashicorp/vault.git
synced 2025-11-30 07:01:14 +01:00
[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 <me@ryan.ec>
This commit is contained in:
parent
06ab7d2702
commit
b76a28a1e0
@ -14,7 +14,7 @@ globals {
|
|||||||
distro_version_leap = ["15.6"]
|
distro_version_leap = ["15.6"]
|
||||||
distro_version_rhel = ["8.10", "9.5"]
|
distro_version_rhel = ["8.10", "9.5"]
|
||||||
distro_version_sles = ["15.6"]
|
distro_version_sles = ["15.6"]
|
||||||
distro_version_ubuntu = ["20.04", "24.04"]
|
distro_version_ubuntu = ["22.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"]
|
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"]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -39,7 +39,6 @@ globals {
|
|||||||
"15.6" = ["netcat-openbsd", "openssl", "openldap2-client"]
|
"15.6" = ["netcat-openbsd", "openssl", "openldap2-client"]
|
||||||
}
|
}
|
||||||
ubuntu = {
|
ubuntu = {
|
||||||
"20.04" = ["netcat", "ldap-utils"]
|
|
||||||
"22.04" = ["netcat", "ldap-utils"]
|
"22.04" = ["netcat", "ldap-utils"]
|
||||||
"24.04" = ["netcat-openbsd", "ldap-utils"]
|
"24.04" = ["netcat-openbsd", "ldap-utils"]
|
||||||
}
|
}
|
||||||
|
|||||||
@ -95,7 +95,7 @@ variable "distro_version_sles" {
|
|||||||
variable "distro_version_ubuntu" {
|
variable "distro_version_ubuntu" {
|
||||||
description = "The version of ubuntu to use"
|
description = "The version of ubuntu to use"
|
||||||
type = string
|
type = string
|
||||||
default = "24.04" // or "20.04", "22.04"
|
default = "24.04" // or "22.04"
|
||||||
}
|
}
|
||||||
|
|
||||||
variable "tags" {
|
variable "tags" {
|
||||||
|
|||||||
@ -47,7 +47,7 @@
|
|||||||
// distro_version_sles = "v15_sp5_standard"
|
// distro_version_sles = "v15_sp5_standard"
|
||||||
|
|
||||||
// distro_version_ubuntu is the version of ubuntu to use for "distro:ubuntu" variants
|
// 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
|
// tags are a map of tags that will be applied to infrastructure resources that
|
||||||
// support tagging.
|
// support tagging.
|
||||||
|
|||||||
@ -158,7 +158,6 @@ locals {
|
|||||||
"15.6" = "RHEL/9/${local.release_sub_path_rpm}"
|
"15.6" = "RHEL/9/${local.release_sub_path_rpm}"
|
||||||
}
|
}
|
||||||
ubuntu = {
|
ubuntu = {
|
||||||
"20.04" = local.release_path_deb,
|
|
||||||
"22.04" = local.release_path_deb,
|
"22.04" = local.release_path_deb,
|
||||||
"24.04" = local.release_path_deb,
|
"24.04" = local.release_path_deb,
|
||||||
}
|
}
|
||||||
|
|||||||
@ -33,7 +33,6 @@ locals {
|
|||||||
"15.6" = data.aws_ami.sles_15["arm64"].id
|
"15.6" = data.aws_ami.sles_15["arm64"].id
|
||||||
}
|
}
|
||||||
"ubuntu" = {
|
"ubuntu" = {
|
||||||
"20.04" = data.aws_ami.ubuntu_2004["arm64"].id
|
|
||||||
"22.04" = data.aws_ami.ubuntu_2204["arm64"].id
|
"22.04" = data.aws_ami.ubuntu_2204["arm64"].id
|
||||||
"24.04" = data.aws_ami.ubuntu_2404["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
|
"15.6" = data.aws_ami.sles_15["x86_64"].id
|
||||||
}
|
}
|
||||||
"ubuntu" = {
|
"ubuntu" = {
|
||||||
"20.04" = data.aws_ami.ubuntu_2004["x86_64"].id
|
|
||||||
"22.04" = data.aws_ami.ubuntu_2204["x86_64"].id
|
"22.04" = data.aws_ami.ubuntu_2204["x86_64"].id
|
||||||
"24.04" = data.aws_ami.ubuntu_2404["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]
|
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" {
|
data "aws_ami" "ubuntu_2204" {
|
||||||
most_recent = true
|
most_recent = true
|
||||||
for_each = local.architectures
|
for_each = local.architectures
|
||||||
|
|||||||
@ -47,7 +47,6 @@ locals {
|
|||||||
"9.5" = ["softhsm", "opensc"]
|
"9.5" = ["softhsm", "opensc"]
|
||||||
}
|
}
|
||||||
ubuntu = {
|
ubuntu = {
|
||||||
"20.04" = ["softhsm", "opensc"]
|
|
||||||
"22.04" = ["softhsm", "opensc"]
|
"22.04" = ["softhsm", "opensc"]
|
||||||
"24.04" = ["softhsm2", "opensc"]
|
"24.04" = ["softhsm2", "opensc"]
|
||||||
}
|
}
|
||||||
@ -60,7 +59,6 @@ locals {
|
|||||||
"9.5" = ["softhsm"]
|
"9.5" = ["softhsm"]
|
||||||
}
|
}
|
||||||
ubuntu = {
|
ubuntu = {
|
||||||
"20.04" = ["softhsm"]
|
|
||||||
"22.04" = ["softhsm"]
|
"22.04" = ["softhsm"]
|
||||||
"24.04" = ["softhsm2"]
|
"24.04" = ["softhsm2"]
|
||||||
}
|
}
|
||||||
|
|||||||
@ -137,7 +137,7 @@ func (e *EnosDynamicConfigReq) getSampleAttrs(ctx context.Context) (*SampleAttrs
|
|||||||
DistroVersionLeap: []string{"15.6"},
|
DistroVersionLeap: []string{"15.6"},
|
||||||
DistroVersionRhel: []string{"8.10", "9.5"},
|
DistroVersionRhel: []string{"8.10", "9.5"},
|
||||||
DistroVersionSles: []string{"15.6"},
|
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
|
// Create our initial upgrade version list. We'll find all released versions between N-3 -> Current
|
||||||
|
|||||||
@ -232,7 +232,7 @@ func Test_EnosDynamicConfigReq_Run(t *testing.T) {
|
|||||||
DistroVersionLeap: []string{"15.6"},
|
DistroVersionLeap: []string{"15.6"},
|
||||||
DistroVersionRhel: []string{"8.10", "9.5"},
|
DistroVersionRhel: []string{"8.10", "9.5"},
|
||||||
DistroVersionSles: []string{"15.6"},
|
DistroVersionSles: []string{"15.6"},
|
||||||
DistroVersionUbuntu: []string{"20.04", "24.04"},
|
DistroVersionUbuntu: []string{"22.04", "24.04"},
|
||||||
UpgradeInitialVersion: versions,
|
UpgradeInitialVersion: versions,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -254,7 +254,7 @@ globals {
|
|||||||
distro_version_leap = ["15.6"]
|
distro_version_leap = ["15.6"]
|
||||||
distro_version_rhel = ["8.10", "9.5"]
|
distro_version_rhel = ["8.10", "9.5"]
|
||||||
distro_version_sles = ["15.6"]
|
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"]
|
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"]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user