Skip to content

Commit 750060b

Browse files
carsonipcarsonip
authored
Merge branch 'main' into bump-apm-perf
2 parents 64553da + d811d76 commit 750060b

File tree

2 files changed

+44
-69
lines changed

2 files changed

+44
-69
lines changed

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

+42-64
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,57 @@
11
locals {
22
image_owners = {
3-
"ubuntu-bionic-18.04-arm64-server" = "099720109477" # canonical
4-
"ubuntu-focal-20.04-arm64-server" = "099720109477" # canonical
5-
"ubuntu-jammy-22.04-arm64-server" = "099720109477" # canonical
6-
"debian-10-arm64" = "136693071363" # debian
7-
"debian-11-arm64" = "136693071363" # debian
8-
"amzn2-ami-kernel-5.10" = "137112412989" # amazon
9-
"amzn2-ami-hvm-*-x86_64-ebs" = "137112412989" # amazon
10-
"al2023-ami-2023" = "137112412989" # amazon
11-
"RHEL-7" = "309956199498" # Red Hat
12-
"RHEL-8" = "309956199498" # Red Hat
13-
"RHEL-9" = "309956199498" # Red Hat
3+
"ubuntu-focal-20.04-arm64-server" = "099720109477" # canonical
4+
"ubuntu-jammy-22.04-arm64-server" = "099720109477" # canonical
5+
"ubuntu-noble-24.04-arm64-server" = "099720109477" # canonical
6+
"debian-12-arm64" = "136693071363" # debian
7+
"al2023-ami-2023" = "137112412989" # amazon
8+
"RHEL-8" = "309956199498" # Red Hat
9+
"RHEL-9" = "309956199498" # Red Hat
1410
}
1511
instance_types = {
16-
"ubuntu-bionic-18.04-arm64-server" = "t4g.nano"
17-
"ubuntu-focal-20.04-arm64-server" = "t4g.nano"
18-
"ubuntu-jammy-22.04-arm64-server" = "t4g.nano"
19-
"debian-10-arm64" = "t4g.nano"
20-
"debian-11-arm64" = "t4g.nano"
21-
"amzn2-ami-kernel-5.10" = "t4g.nano"
22-
"amzn2-ami-hvm-*-x86_64-ebs" = "t4g.nano"
23-
"al2023-ami-2023" = "t4g.nano"
24-
"RHEL-7" = "t3a.micro" # RHEL-7 doesn't support arm
25-
"RHEL-8" = "t4g.micro" # RHEL doesn't support nano instances
26-
"RHEL-9" = "t4g.micro" # RHEL doesn't support nano instances
12+
"ubuntu-focal-20.04-arm64-server" = "t4g.nano"
13+
"ubuntu-jammy-22.04-arm64-server" = "t4g.nano"
14+
"ubuntu-noble-24.04-arm64-server" = "t4g.nano"
15+
"debian-12-arm64" = "t4g.nano"
16+
"al2023-ami-2023" = "t4g.nano"
17+
"RHEL-8" = "t4g.micro" # RHEL doesn't support nano instances
18+
"RHEL-9" = "t4g.micro" # RHEL doesn't support nano instances
2719
}
2820
instance_arch = {
29-
"ubuntu-bionic-18.04-arm64-server" = "arm64"
30-
"ubuntu-focal-20.04-arm64-server" = "arm64"
31-
"ubuntu-jammy-22.04-arm64-server" = "arm64"
32-
"debian-10-arm64" = "arm64"
33-
"debian-11-arm64" = "arm64"
34-
"amzn2-ami-kernel-5.10" = "arm64"
35-
"amzn2-ami-hvm-*-x86_64-ebs" = "x86_64"
36-
"al2023-ami-2023" = "arm64"
37-
"RHEL-7" = "x86_64" # RHEL-7 doesn't support arm
38-
"RHEL-8" = "arm64"
39-
"RHEL-9" = "arm64"
21+
"ubuntu-focal-20.04-arm64-server" = "arm64"
22+
"ubuntu-jammy-22.04-arm64-server" = "arm64"
23+
"ubuntu-noble-24.04-arm64-server" = "arm64"
24+
"debian-12-arm64" = "arm64"
25+
"al2023-ami-2023" = "arm64"
26+
"RHEL-8" = "arm64"
27+
"RHEL-9" = "arm64"
4028
}
4129
instance_ea_provision_cmd = {
42-
"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"
43-
"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"
44-
"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"
46-
"debian-11-arm64" = "curl ${data.external.latest_elastic_agent.result.deb_arm} -o elastic-agent.deb && sudo dpkg -i elastic-agent.deb"
47-
"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"
48-
"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"
50-
"RHEL-8" = "curl ${data.external.latest_elastic_agent.result.rpm_arm} -o elastic-agent.rpm && sudo yum -y install elastic-agent.rpm"
51-
"RHEL-9" = "curl ${data.external.latest_elastic_agent.result.rpm_arm} -o elastic-agent.rpm && sudo yum -y install elastic-agent.rpm"
30+
"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"
31+
"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"
32+
"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"
33+
"debian-12-arm64" = "curl ${data.external.latest_elastic_agent.result.deb_arm} -o elastic-agent.deb && sudo dpkg -i elastic-agent.deb"
34+
"al2023-ami-2023" = "curl ${data.external.latest_elastic_agent.result.rpm_arm} -o elastic-agent.rpm && sudo yum -y install elastic-agent.rpm"
35+
"RHEL-8" = "curl ${data.external.latest_elastic_agent.result.rpm_arm} -o elastic-agent.rpm && sudo yum -y install elastic-agent.rpm"
36+
"RHEL-9" = "curl ${data.external.latest_elastic_agent.result.rpm_arm} -o elastic-agent.rpm && sudo yum -y install elastic-agent.rpm"
5237
}
5338
instance_standalone_provision_cmd = {
54-
"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"
55-
"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"
56-
"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"
58-
"debian-11-arm64" = "curl ${data.external.latest_apm_server.result.deb_arm} -o apm-server.deb && sudo dpkg -i apm-server.deb"
59-
"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"
60-
"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"
62-
"RHEL-8" = "curl ${data.external.latest_apm_server.result.rpm_arm} -o apm-server.rpm && sudo yum -y install apm-server.rpm"
63-
"RHEL-9" = "curl ${data.external.latest_apm_server.result.rpm_arm} -o apm-server.rpm && sudo yum -y install apm-server.rpm"
39+
"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"
40+
"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"
41+
"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"
42+
"debian-12-arm64" = "curl ${data.external.latest_apm_server.result.deb_arm} -o apm-server.deb && sudo dpkg -i apm-server.deb"
43+
"al2023-ami-2023" = "curl ${data.external.latest_apm_server.result.rpm_arm} -o apm-server.rpm && sudo yum -y install apm-server.rpm"
44+
"RHEL-8" = "curl ${data.external.latest_apm_server.result.rpm_arm} -o apm-server.rpm && sudo yum -y install apm-server.rpm"
45+
"RHEL-9" = "curl ${data.external.latest_apm_server.result.rpm_arm} -o apm-server.rpm && sudo yum -y install apm-server.rpm"
6446
}
6547
image_ssh_users = {
66-
"ubuntu-bionic-18.04-arm64-server" = "ubuntu"
67-
"ubuntu-focal-20.04-arm64-server" = "ubuntu"
68-
"ubuntu-jammy-22.04-arm64-server" = "ubuntu"
69-
"debian-10-arm64" = "admin"
70-
"debian-11-arm64" = "admin"
71-
"amzn2-ami-kernel-5.10" = "ec2-user"
72-
"amzn2-ami-hvm-*-x86_64-ebs" = "ec2-user"
73-
"al2023-ami-2023" = "ec2-user"
74-
"RHEL-7" = "ec2-user"
75-
"RHEL-8" = "ec2-user"
76-
"RHEL-9" = "ec2-user"
48+
"ubuntu-focal-20.04-arm64-server" = "ubuntu"
49+
"ubuntu-jammy-22.04-arm64-server" = "ubuntu"
50+
"ubuntu-noble-24.04-arm64-server" = "ubuntu"
51+
"debian-12-arm64" = "admin"
52+
"al2023-ami-2023" = "ec2-user"
53+
"RHEL-8" = "ec2-user"
54+
"RHEL-9" = "ec2-user"
7755
}
7856

7957
apm_port = "8200"

‎testing/smoke/os_matrix.sh

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
#!/usr/bin/env bash
22

33
os_names=(
4-
"ubuntu-bionic-18.04-arm64-server"
54
"ubuntu-focal-20.04-arm64-server"
65
"ubuntu-jammy-22.04-arm64-server"
7-
"debian-10-arm64"
8-
"debian-11-arm64"
9-
"amzn2-ami-kernel-5.10"
6+
"ubuntu-noble-24.04-arm64-server"
7+
"debian-12-arm64"
108
"al2023-ami-2023"
11-
"RHEL-7"
129
"RHEL-8"
1310
"RHEL-9"
1411
)

0 commit comments

Comments
 (0)