Skip to content

Commit 8eb7a35

Browse files
carsonipcarsonip
authored
tf: Temporarily remove missing Rocky Linux 8 AMI from standalone_apm_server (#21247)
* Temporarily remove Rocky Linux 8 from standalone_apm_server * tf format
1 parent 846ecbf commit 8eb7a35

1 file changed

Lines changed: 36 additions & 36 deletions

File tree

  • testing/infra/terraform/modules/standalone_apm_server

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

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ locals {
88
"al2023-ami-2023.*-x86_64" = "137112412989" # amazon
99
"RHEL-8" = "309956199498" # Red Hat
1010
"RHEL-9" = "309956199498" # Red Hat
11-
"Rocky-8-EC2-Base" = "792107900819" # Rocky Linux
12-
"Rocky-9-EC2-Base" = "792107900819" # Rocky Linux
13-
"AlmaLinux OS 8" = "764336703387" # AlmaLinux OS Foundation
14-
"AlmaLinux OS 9" = "764336703387" # AlmaLinux OS Foundation
15-
"OL8" = "131827586825" # Oracle
16-
"OL9" = "131827586825" # Oracle
11+
# "Rocky-8-EC2-Base" = "792107900819" # Rocky Linux # See https://github.com/elastic/apm-server/issues/21179
12+
"Rocky-9-EC2-Base" = "792107900819" # Rocky Linux
13+
"AlmaLinux OS 8" = "764336703387" # AlmaLinux OS Foundation
14+
"AlmaLinux OS 9" = "764336703387" # AlmaLinux OS Foundation
15+
"OL8" = "131827586825" # Oracle
16+
"OL9" = "131827586825" # Oracle
1717
}
1818
instance_types = {
1919
"ubuntu-focal-20.04-arm64-server" = "t4g.nano"
@@ -24,12 +24,12 @@ locals {
2424
"al2023-ami-2023.*-x86_64" = "t3a.micro"
2525
"RHEL-8" = "t4g.micro" # RHEL doesn't support nano instances
2626
"RHEL-9" = "t4g.micro" # RHEL doesn't support nano instances
27-
"Rocky-8-EC2-Base" = "t4g.micro" # Larger instance size to improve test reliability
28-
"Rocky-9-EC2-Base" = "t4g.nano"
29-
"AlmaLinux OS 8" = "t4g.nano"
30-
"AlmaLinux OS 9" = "t4g.nano"
31-
"OL8" = "t4g.nano"
32-
"OL9" = "t4g.nano"
27+
# "Rocky-8-EC2-Base" = "t4g.micro" # Larger instance size to improve test reliability
28+
"Rocky-9-EC2-Base" = "t4g.nano"
29+
"AlmaLinux OS 8" = "t4g.nano"
30+
"AlmaLinux OS 9" = "t4g.nano"
31+
"OL8" = "t4g.nano"
32+
"OL9" = "t4g.nano"
3333
}
3434
instance_arch = {
3535
"ubuntu-focal-20.04-arm64-server" = "arm64"
@@ -40,12 +40,12 @@ locals {
4040
"al2023-ami-2023.*-x86_64" = "x86_64"
4141
"RHEL-8" = "arm64"
4242
"RHEL-9" = "arm64"
43-
"Rocky-8-EC2-Base" = "arm64"
44-
"Rocky-9-EC2-Base" = "arm64"
45-
"AlmaLinux OS 8" = "arm64"
46-
"AlmaLinux OS 9" = "arm64"
47-
"OL8" = "arm64"
48-
"OL9" = "arm64"
43+
# "Rocky-8-EC2-Base" = "arm64"
44+
"Rocky-9-EC2-Base" = "arm64"
45+
"AlmaLinux OS 8" = "arm64"
46+
"AlmaLinux OS 9" = "arm64"
47+
"OL8" = "arm64"
48+
"OL9" = "arm64"
4949
}
5050
instance_ea_provision_cmd = {
5151
"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"
@@ -56,12 +56,12 @@ locals {
5656
"al2023-ami-2023.*-x86_64" = "curl ${data.external.latest_elastic_agent.result.rpm_arm} -o elastic-agent.rpm && sudo rpm -i elastic-agent.rpm"
5757
"RHEL-8" = "curl ${data.external.latest_elastic_agent.result.rpm_arm} -o elastic-agent.rpm && sudo rpm -i elastic-agent.rpm"
5858
"RHEL-9" = "curl ${data.external.latest_elastic_agent.result.rpm_arm} -o elastic-agent.rpm && sudo rpm -i elastic-agent.rpm"
59-
"Rocky-8-EC2-Base" = "curl ${data.external.latest_elastic_agent.result.rpm_arm} -o elastic-agent.rpm && sudo rpm -i elastic-agent.rpm"
60-
"Rocky-9-EC2-Base" = "curl ${data.external.latest_elastic_agent.result.rpm_arm} -o elastic-agent.rpm && sudo rpm -i elastic-agent.rpm"
61-
"AlmaLinux OS 8" = "curl ${data.external.latest_elastic_agent.result.rpm_arm} -o elastic-agent.rpm && sudo rpm -i elastic-agent.rpm"
62-
"AlmaLinux OS 9" = "curl ${data.external.latest_elastic_agent.result.rpm_arm} -o elastic-agent.rpm && sudo rpm -i elastic-agent.rpm"
63-
"OL8" = "curl ${data.external.latest_elastic_agent.result.rpm_arm} -o elastic-agent.rpm && sudo rpm -i elastic-agent.rpm"
64-
"OL9" = "curl ${data.external.latest_elastic_agent.result.rpm_arm} -o elastic-agent.rpm && sudo rpm -i elastic-agent.rpm"
59+
# "Rocky-8-EC2-Base" = "curl ${data.external.latest_elastic_agent.result.rpm_arm} -o elastic-agent.rpm && sudo rpm -i elastic-agent.rpm"
60+
"Rocky-9-EC2-Base" = "curl ${data.external.latest_elastic_agent.result.rpm_arm} -o elastic-agent.rpm && sudo rpm -i elastic-agent.rpm"
61+
"AlmaLinux OS 8" = "curl ${data.external.latest_elastic_agent.result.rpm_arm} -o elastic-agent.rpm && sudo rpm -i elastic-agent.rpm"
62+
"AlmaLinux OS 9" = "curl ${data.external.latest_elastic_agent.result.rpm_arm} -o elastic-agent.rpm && sudo rpm -i elastic-agent.rpm"
63+
"OL8" = "curl ${data.external.latest_elastic_agent.result.rpm_arm} -o elastic-agent.rpm && sudo rpm -i elastic-agent.rpm"
64+
"OL9" = "curl ${data.external.latest_elastic_agent.result.rpm_arm} -o elastic-agent.rpm && sudo rpm -i elastic-agent.rpm"
6565
}
6666
instance_standalone_provision_cmd = {
6767
"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"
@@ -72,12 +72,12 @@ locals {
7272
"al2023-ami-2023.*-x86_64" = "curl ${data.external.latest_apm_server.result.rpm_arm} -o apm-server.rpm && sudo rpm -i apm-server.rpm"
7373
"RHEL-8" = "curl ${data.external.latest_apm_server.result.rpm_arm} -o apm-server.rpm && sudo rpm -i apm-server.rpm"
7474
"RHEL-9" = "curl ${data.external.latest_apm_server.result.rpm_arm} -o apm-server.rpm && sudo rpm -i apm-server.rpm"
75-
"Rocky-8-EC2-Base" = "curl ${data.external.latest_apm_server.result.rpm_arm} -o apm-server.rpm && sudo rpm -i apm-server.rpm"
76-
"Rocky-9-EC2-Base" = "curl ${data.external.latest_apm_server.result.rpm_arm} -o apm-server.rpm && sudo rpm -i apm-server.rpm"
77-
"AlmaLinux OS 8" = "curl ${data.external.latest_apm_server.result.rpm_arm} -o apm-server.rpm && sudo rpm -i apm-server.rpm"
78-
"AlmaLinux OS 9" = "curl ${data.external.latest_apm_server.result.rpm_arm} -o apm-server.rpm && sudo rpm -i apm-server.rpm"
79-
"OL8" = "curl ${data.external.latest_apm_server.result.rpm_arm} -o apm-server.rpm && sudo rpm -i apm-server.rpm"
80-
"OL9" = "curl ${data.external.latest_apm_server.result.rpm_arm} -o apm-server.rpm && sudo rpm -i apm-server.rpm"
75+
# "Rocky-8-EC2-Base" = "curl ${data.external.latest_apm_server.result.rpm_arm} -o apm-server.rpm && sudo rpm -i apm-server.rpm"
76+
"Rocky-9-EC2-Base" = "curl ${data.external.latest_apm_server.result.rpm_arm} -o apm-server.rpm && sudo rpm -i apm-server.rpm"
77+
"AlmaLinux OS 8" = "curl ${data.external.latest_apm_server.result.rpm_arm} -o apm-server.rpm && sudo rpm -i apm-server.rpm"
78+
"AlmaLinux OS 9" = "curl ${data.external.latest_apm_server.result.rpm_arm} -o apm-server.rpm && sudo rpm -i apm-server.rpm"
79+
"OL8" = "curl ${data.external.latest_apm_server.result.rpm_arm} -o apm-server.rpm && sudo rpm -i apm-server.rpm"
80+
"OL9" = "curl ${data.external.latest_apm_server.result.rpm_arm} -o apm-server.rpm && sudo rpm -i apm-server.rpm"
8181
}
8282
image_ssh_users = {
8383
"ubuntu-focal-20.04-arm64-server" = "ubuntu"
@@ -88,12 +88,12 @@ locals {
8888
"al2023-ami-2023.*-x86_64" = "ec2-user"
8989
"RHEL-8" = "ec2-user"
9090
"RHEL-9" = "ec2-user"
91-
"Rocky-8-EC2-Base" = "rocky"
92-
"Rocky-9-EC2-Base" = "rocky"
93-
"AlmaLinux OS 8" = "ec2-user"
94-
"AlmaLinux OS 9" = "ec2-user"
95-
"OL8" = "ec2-user"
96-
"OL9" = "ec2-user"
91+
# "Rocky-8-EC2-Base" = "rocky"
92+
"Rocky-9-EC2-Base" = "rocky"
93+
"AlmaLinux OS 8" = "ec2-user"
94+
"AlmaLinux OS 9" = "ec2-user"
95+
"OL8" = "ec2-user"
96+
"OL9" = "ec2-user"
9797
}
9898

9999
apm_port = "8200"

0 commit comments

Comments
 (0)