Skip to content

Commit d6c067d

Browse files
mergify[bot]kruskall
mergify[bot]
and
kruskall
authored
feat: drop support for RHEL 7 and debian 10 (#15688) (#15703)
(cherry picked from commit 2598d97) Co-authored-by: kruskall <[email protected]>
1 parent cc80c94 commit d6c067d

File tree

2 files changed

+0
-14
lines changed

2 files changed

+0
-14
lines changed

‎testing/infra/terraform/modules/standalone_apm_server/main.tf‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,75 +3,63 @@ locals {
33
"ubuntu-bionic-18.04-arm64-server" = "099720109477" # canonical
44
"ubuntu-focal-20.04-arm64-server" = "099720109477" # canonical
55
"ubuntu-jammy-22.04-arm64-server" = "099720109477" # canonical
6-
"debian-10-arm64" = "136693071363" # debian
76
"debian-11-arm64" = "136693071363" # debian
87
"amzn2-ami-kernel-5.10" = "137112412989" # amazon
98
"amzn2-ami-hvm-*-x86_64-ebs" = "137112412989" # amazon
109
"al2023-ami-2023" = "137112412989" # amazon
11-
"RHEL-7" = "309956199498" # Red Hat
1210
"RHEL-8" = "309956199498" # Red Hat
1311
"RHEL-9" = "309956199498" # Red Hat
1412
}
1513
instance_types = {
1614
"ubuntu-bionic-18.04-arm64-server" = "t4g.nano"
1715
"ubuntu-focal-20.04-arm64-server" = "t4g.nano"
1816
"ubuntu-jammy-22.04-arm64-server" = "t4g.nano"
19-
"debian-10-arm64" = "t4g.nano"
2017
"debian-11-arm64" = "t4g.nano"
2118
"amzn2-ami-kernel-5.10" = "t4g.nano"
2219
"amzn2-ami-hvm-*-x86_64-ebs" = "t4g.nano"
2320
"al2023-ami-2023" = "t4g.nano"
24-
"RHEL-7" = "t3a.micro" # RHEL-7 doesn't support arm
2521
"RHEL-8" = "t4g.micro" # RHEL doesn't support nano instances
2622
"RHEL-9" = "t4g.micro" # RHEL doesn't support nano instances
2723
}
2824
instance_arch = {
2925
"ubuntu-bionic-18.04-arm64-server" = "arm64"
3026
"ubuntu-focal-20.04-arm64-server" = "arm64"
3127
"ubuntu-jammy-22.04-arm64-server" = "arm64"
32-
"debian-10-arm64" = "arm64"
3328
"debian-11-arm64" = "arm64"
3429
"amzn2-ami-kernel-5.10" = "arm64"
3530
"amzn2-ami-hvm-*-x86_64-ebs" = "x86_64"
3631
"al2023-ami-2023" = "arm64"
37-
"RHEL-7" = "x86_64" # RHEL-7 doesn't support arm
3832
"RHEL-8" = "arm64"
3933
"RHEL-9" = "arm64"
4034
}
4135
instance_ea_provision_cmd = {
4236
"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"
4337
"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"
4438
"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"
45-
"debian-10-arm64" = "curl ${data.external.latest_elastic_agent.result.deb_arm} -o elastic-agent.deb && sudo dpkg -i elastic-agent.deb"
4639
"debian-11-arm64" = "curl ${data.external.latest_elastic_agent.result.deb_arm} -o elastic-agent.deb && sudo dpkg -i elastic-agent.deb"
4740
"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"
4841
"al2023-ami-2023" = "curl ${data.external.latest_elastic_agent.result.rpm_arm} -o elastic-agent.rpm && sudo yum -y install elastic-agent.rpm"
49-
"RHEL-7" = "curl ${data.external.latest_elastic_agent.result.rpm_amd} -o elastic-agent.rpm && sudo yum -y install elastic-agent.rpm"
5042
"RHEL-8" = "curl ${data.external.latest_elastic_agent.result.rpm_arm} -o elastic-agent.rpm && sudo yum -y install elastic-agent.rpm"
5143
"RHEL-9" = "curl ${data.external.latest_elastic_agent.result.rpm_arm} -o elastic-agent.rpm && sudo yum -y install elastic-agent.rpm"
5244
}
5345
instance_standalone_provision_cmd = {
5446
"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"
5547
"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"
5648
"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"
57-
"debian-10-arm64" = "curl ${data.external.latest_apm_server.result.deb_arm} -o apm-server.deb && sudo dpkg -i apm-server.deb"
5849
"debian-11-arm64" = "curl ${data.external.latest_apm_server.result.deb_arm} -o apm-server.deb && sudo dpkg -i apm-server.deb"
5950
"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"
6051
"al2023-ami-2023" = "curl ${data.external.latest_apm_server.result.rpm_arm} -o apm-server.rpm && sudo yum -y install apm-server.rpm"
61-
"RHEL-7" = "curl ${data.external.latest_apm_server.result.rpm_amd} -o apm-server.rpm && sudo yum -y install apm-server.rpm"
6252
"RHEL-8" = "curl ${data.external.latest_apm_server.result.rpm_arm} -o apm-server.rpm && sudo yum -y install apm-server.rpm"
6353
"RHEL-9" = "curl ${data.external.latest_apm_server.result.rpm_arm} -o apm-server.rpm && sudo yum -y install apm-server.rpm"
6454
}
6555
image_ssh_users = {
6656
"ubuntu-bionic-18.04-arm64-server" = "ubuntu"
6757
"ubuntu-focal-20.04-arm64-server" = "ubuntu"
6858
"ubuntu-jammy-22.04-arm64-server" = "ubuntu"
69-
"debian-10-arm64" = "admin"
7059
"debian-11-arm64" = "admin"
7160
"amzn2-ami-kernel-5.10" = "ec2-user"
7261
"amzn2-ami-hvm-*-x86_64-ebs" = "ec2-user"
7362
"al2023-ami-2023" = "ec2-user"
74-
"RHEL-7" = "ec2-user"
7563
"RHEL-8" = "ec2-user"
7664
"RHEL-9" = "ec2-user"
7765
}

‎testing/smoke/os_matrix.sh‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@ os_names=(
44
"ubuntu-bionic-18.04-arm64-server"
55
"ubuntu-focal-20.04-arm64-server"
66
"ubuntu-jammy-22.04-arm64-server"
7-
"debian-10-arm64"
87
"debian-11-arm64"
98
"amzn2-ami-kernel-5.10"
109
"al2023-ami-2023"
11-
"RHEL-7"
1210
"RHEL-8"
1311
"RHEL-9"
1412
)

0 commit comments

Comments
 (0)