Merge branch 'main' into feat/chainguard-image

kruskall · Jun 7, 2024 · 953ee3f · 953ee3f
2 parents f73baae + 76ef6b2
commit 953ee3f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/testing/infra/terraform/modules/standalone_apm_server/main.tf b/testing/infra/terraform/modules/standalone_apm_server/main.tf
@@ -6,6 +6,7 @@ locals {
     "debian-10-arm64"                  = "136693071363" # debian
     "debian-11-arm64"                  = "136693071363" # debian
     "amzn2-ami-kernel-5.10"            = "137112412989" # amazon
+    "al2023-ami-2023"                  = "137112412989" # amazon
     "RHEL-7"                           = "309956199498" # Red Hat
     "RHEL-8"                           = "309956199498" # Red Hat
     "RHEL-9"                           = "309956199498" # Red Hat
@@ -17,6 +18,7 @@ locals {
     "debian-10-arm64"                  = "t4g.nano"
     "debian-11-arm64"                  = "t4g.nano"
     "amzn2-ami-kernel-5.10"            = "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
@@ -28,6 +30,7 @@ locals {
     "debian-10-arm64"                  = "arm64"
     "debian-11-arm64"                  = "arm64"
     "amzn2-ami-kernel-5.10"            = "arm64"
+    "al2023-ami-2023"                  = "arm64"
     "RHEL-7"                           = "x86_64" # RHEL-7 doesn't support arm
     "RHEL-8"                           = "arm64"
     "RHEL-9"                           = "arm64"
@@ -39,6 +42,7 @@ locals {
     "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"
@@ -50,6 +54,7 @@ locals {
     "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"
@@ -61,6 +66,7 @@ locals {
     "debian-10-arm64"                  = "admin"
     "debian-11-arm64"                  = "admin"
     "amzn2-ami-kernel-5.10"            = "ec2-user"
+    "al2023-ami-2023"                  = "ec2-user"
     "RHEL-7"                           = "ec2-user"
     "RHEL-8"                           = "ec2-user"
     "RHEL-9"                           = "ec2-user"

diff --git a/testing/smoke/os_matrix.sh b/testing/smoke/os_matrix.sh
@@ -7,6 +7,7 @@ os_names=(
     "debian-10-arm64"
     "debian-11-arm64"
     "amzn2-ami-kernel-5.10"
+    "al2023-ami-2023"
     "RHEL-7"
     "RHEL-8"
     "RHEL-9"