Skip to content

Commit

Permalink
test(smoke): align OS versions with support policy (#15535)
Browse files Browse the repository at this point in the history 
* test(smoke): align OS versions with support policy

drop unsupported versions: ubuntu 18, amazon 2, debuan 10, debian 11
RHEL 7

add new versions: ubuntu 24, debian 12

* lint: terraform format
  • Loading branch information
@kruskall
kruskall authored Feb 7, 2025
1 parent c12fad8 commit d811d76
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 69 deletions.
106 changes: 42 additions & 64 deletions testing/infra/terraform/modules/standalone_apm_server/main.tf
View file
Original file line number Diff line number Diff line change
@@ -1,79 +1,57 @@
locals {
image_owners = {
"ubuntu-bionic-18.04-arm64-server" = "099720109477" # canonical
"ubuntu-focal-20.04-arm64-server" = "099720109477" # canonical
"ubuntu-jammy-22.04-arm64-server" = "099720109477" # canonical
"debian-10-arm64" = "136693071363" # debian
"debian-11-arm64" = "136693071363" # debian
"amzn2-ami-kernel-5.10" = "137112412989" # amazon
"amzn2-ami-hvm-*-x86_64-ebs" = "137112412989" # amazon
"al2023-ami-2023" = "137112412989" # amazon
"RHEL-7" = "309956199498" # Red Hat
"RHEL-8" = "309956199498" # Red Hat
"RHEL-9" = "309956199498" # Red Hat
"ubuntu-focal-20.04-arm64-server" = "099720109477" # canonical
"ubuntu-jammy-22.04-arm64-server" = "099720109477" # canonical
"ubuntu-noble-24.04-arm64-server" = "099720109477" # canonical
"debian-12-arm64" = "136693071363" # debian
"al2023-ami-2023" = "137112412989" # amazon
"RHEL-8" = "309956199498" # Red Hat
"RHEL-9" = "309956199498" # Red Hat
}
instance_types = {
"ubuntu-bionic-18.04-arm64-server" = "t4g.nano"
"ubuntu-focal-20.04-arm64-server" = "t4g.nano"
"ubuntu-jammy-22.04-arm64-server" = "t4g.nano"
"debian-10-arm64" = "t4g.nano"
"debian-11-arm64" = "t4g.nano"
"amzn2-ami-kernel-5.10" = "t4g.nano"
"amzn2-ami-hvm-*-x86_64-ebs" = "t4g.nano"
"al2023-ami-2023" = "t4g.nano"
"RHEL-7" = "t3a.micro" # RHEL-7 doesn't support arm
"RHEL-8" = "t4g.micro" # RHEL doesn't support nano instances
"RHEL-9" = "t4g.micro" # RHEL doesn't support nano instances
"ubuntu-focal-20.04-arm64-server" = "t4g.nano"
"ubuntu-jammy-22.04-arm64-server" = "t4g.nano"
"ubuntu-noble-24.04-arm64-server" = "t4g.nano"
"debian-12-arm64" = "t4g.nano"
"al2023-ami-2023" = "t4g.nano"
"RHEL-8" = "t4g.micro" # RHEL doesn't support nano instances
"RHEL-9" = "t4g.micro" # RHEL doesn't support nano instances
}
instance_arch = {
"ubuntu-bionic-18.04-arm64-server" = "arm64"
"ubuntu-focal-20.04-arm64-server" = "arm64"
"ubuntu-jammy-22.04-arm64-server" = "arm64"
"debian-10-arm64" = "arm64"
"debian-11-arm64" = "arm64"
"amzn2-ami-kernel-5.10" = "arm64"
"amzn2-ami-hvm-*-x86_64-ebs" = "x86_64"
"al2023-ami-2023" = "arm64"
"RHEL-7" = "x86_64" # RHEL-7 doesn't support arm
"RHEL-8" = "arm64"
"RHEL-9" = "arm64"
"ubuntu-focal-20.04-arm64-server" = "arm64"
"ubuntu-jammy-22.04-arm64-server" = "arm64"
"ubuntu-noble-24.04-arm64-server" = "arm64"
"debian-12-arm64" = "arm64"
"al2023-ami-2023" = "arm64"
"RHEL-8" = "arm64"
"RHEL-9" = "arm64"
}
instance_ea_provision_cmd = {
"ubuntu-bionic-18.04-arm64-server" = "curl ${data.external.latest_elastic_agent.result.deb_arm} -o elastic-agent.deb && sudo dpkg -i elastic-agent.deb"
"ubuntu-focal-20.04-arm64-server" = "curl ${data.external.latest_elastic_agent.result.deb_arm} -o elastic-agent.deb && sudo dpkg -i elastic-agent.deb"
"ubuntu-jammy-22.04-arm64-server" = "curl ${data.external.latest_elastic_agent.result.deb_arm} -o elastic-agent.deb && sudo dpkg -i elastic-agent.deb"
"debian-10-arm64" = "curl ${data.external.latest_elastic_agent.result.deb_arm} -o elastic-agent.deb && sudo dpkg -i elastic-agent.deb"
"debian-11-arm64" = "curl ${data.external.latest_elastic_agent.result.deb_arm} -o elastic-agent.deb && sudo dpkg -i elastic-agent.deb"
"amzn2-ami-kernel-5.10" = "curl ${data.external.latest_elastic_agent.result.rpm_arm} -o elastic-agent.rpm && sudo yum -y install elastic-agent.rpm"
"al2023-ami-2023" = "curl ${data.external.latest_elastic_agent.result.rpm_arm} -o elastic-agent.rpm && sudo yum -y install elastic-agent.rpm"
"RHEL-7" = "curl ${data.external.latest_elastic_agent.result.rpm_amd} -o elastic-agent.rpm && sudo yum -y install elastic-agent.rpm"
"RHEL-8" = "curl ${data.external.latest_elastic_agent.result.rpm_arm} -o elastic-agent.rpm && sudo yum -y install elastic-agent.rpm"
"RHEL-9" = "curl ${data.external.latest_elastic_agent.result.rpm_arm} -o elastic-agent.rpm && sudo yum -y install elastic-agent.rpm"
"ubuntu-focal-20.04-arm64-server" = "curl ${data.external.latest_elastic_agent.result.deb_arm} -o elastic-agent.deb && sudo dpkg -i elastic-agent.deb"
"ubuntu-jammy-22.04-arm64-server" = "curl ${data.external.latest_elastic_agent.result.deb_arm} -o elastic-agent.deb && sudo dpkg -i elastic-agent.deb"
"ubuntu-noble-24.04-arm64-server" = "curl ${data.external.latest_elastic_agent.result.deb_arm} -o elastic-agent.deb && sudo dpkg -i elastic-agent.deb"
"debian-12-arm64" = "curl ${data.external.latest_elastic_agent.result.deb_arm} -o elastic-agent.deb && sudo dpkg -i elastic-agent.deb"
"al2023-ami-2023" = "curl ${data.external.latest_elastic_agent.result.rpm_arm} -o elastic-agent.rpm && sudo yum -y install elastic-agent.rpm"
"RHEL-8" = "curl ${data.external.latest_elastic_agent.result.rpm_arm} -o elastic-agent.rpm && sudo yum -y install elastic-agent.rpm"
"RHEL-9" = "curl ${data.external.latest_elastic_agent.result.rpm_arm} -o elastic-agent.rpm && sudo yum -y install elastic-agent.rpm"
}
instance_standalone_provision_cmd = {
"ubuntu-bionic-18.04-arm64-server" = "curl ${data.external.latest_apm_server.result.deb_arm} -o apm-server.deb && sudo dpkg -i apm-server.deb"
"ubuntu-focal-20.04-arm64-server" = "curl ${data.external.latest_apm_server.result.deb_arm} -o apm-server.deb && sudo dpkg -i apm-server.deb"
"ubuntu-jammy-22.04-arm64-server" = "curl ${data.external.latest_apm_server.result.deb_arm} -o apm-server.deb && sudo dpkg -i apm-server.deb"
"debian-10-arm64" = "curl ${data.external.latest_apm_server.result.deb_arm} -o apm-server.deb && sudo dpkg -i apm-server.deb"
"debian-11-arm64" = "curl ${data.external.latest_apm_server.result.deb_arm} -o apm-server.deb && sudo dpkg -i apm-server.deb"
"amzn2-ami-kernel-5.10" = "curl ${data.external.latest_apm_server.result.rpm_arm} -o apm-server.rpm && sudo yum -y install apm-server.rpm"
"al2023-ami-2023" = "curl ${data.external.latest_apm_server.result.rpm_arm} -o apm-server.rpm && sudo yum -y install apm-server.rpm"
"RHEL-7" = "curl ${data.external.latest_apm_server.result.rpm_amd} -o apm-server.rpm && sudo yum -y install apm-server.rpm"
"RHEL-8" = "curl ${data.external.latest_apm_server.result.rpm_arm} -o apm-server.rpm && sudo yum -y install apm-server.rpm"
"RHEL-9" = "curl ${data.external.latest_apm_server.result.rpm_arm} -o apm-server.rpm && sudo yum -y install apm-server.rpm"
"ubuntu-focal-20.04-arm64-server" = "curl ${data.external.latest_apm_server.result.deb_arm} -o apm-server.deb && sudo dpkg -i apm-server.deb"
"ubuntu-jammy-22.04-arm64-server" = "curl ${data.external.latest_apm_server.result.deb_arm} -o apm-server.deb && sudo dpkg -i apm-server.deb"
"ubuntu-noble-24.04-arm64-server" = "curl ${data.external.latest_apm_server.result.deb_arm} -o apm-server.deb && sudo dpkg -i apm-server.deb"
"debian-12-arm64" = "curl ${data.external.latest_apm_server.result.deb_arm} -o apm-server.deb && sudo dpkg -i apm-server.deb"
"al2023-ami-2023" = "curl ${data.external.latest_apm_server.result.rpm_arm} -o apm-server.rpm && sudo yum -y install apm-server.rpm"
"RHEL-8" = "curl ${data.external.latest_apm_server.result.rpm_arm} -o apm-server.rpm && sudo yum -y install apm-server.rpm"
"RHEL-9" = "curl ${data.external.latest_apm_server.result.rpm_arm} -o apm-server.rpm && sudo yum -y install apm-server.rpm"
}
image_ssh_users = {
"ubuntu-bionic-18.04-arm64-server" = "ubuntu"
"ubuntu-focal-20.04-arm64-server" = "ubuntu"
"ubuntu-jammy-22.04-arm64-server" = "ubuntu"
"debian-10-arm64" = "admin"
"debian-11-arm64" = "admin"
"amzn2-ami-kernel-5.10" = "ec2-user"
"amzn2-ami-hvm-*-x86_64-ebs" = "ec2-user"
"al2023-ami-2023" = "ec2-user"
"RHEL-7" = "ec2-user"
"RHEL-8" = "ec2-user"
"RHEL-9" = "ec2-user"
"ubuntu-focal-20.04-arm64-server" = "ubuntu"
"ubuntu-jammy-22.04-arm64-server" = "ubuntu"
"ubuntu-noble-24.04-arm64-server" = "ubuntu"
"debian-12-arm64" = "admin"
"al2023-ami-2023" = "ec2-user"
"RHEL-8" = "ec2-user"
"RHEL-9" = "ec2-user"
}

apm_port = "8200"
Expand Down
7 changes: 2 additions & 5 deletions testing/smoke/os_matrix.sh
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
#!/usr/bin/env bash

os_names=(
"ubuntu-bionic-18.04-arm64-server"
"ubuntu-focal-20.04-arm64-server"
"ubuntu-jammy-22.04-arm64-server"
"debian-10-arm64"
"debian-11-arm64"
"amzn2-ami-kernel-5.10"
"ubuntu-noble-24.04-arm64-server"
"debian-12-arm64"
"al2023-ami-2023"
"RHEL-7"
"RHEL-8"
"RHEL-9"
)
Expand Down

0 comments on commit d811d76

Please sign in to comment.