Merge branch 'aws:main' into branch_pull_behavior

aws · Nov 7, 2023 · 545e7b5 · 545e7b5
2 parents 398c70d + 2f55b40
commit 545e7b5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/al2gpu.pkr.hcl b/al2gpu.pkr.hcl
@@ -15,7 +15,7 @@ source "amazon-ebs" "al2gpu" {
   region = var.region
   source_ami_filter {
     filters = {
-      name = "${var.source_ami_al2}"
+      name = "${var.source_ami_al2_gpu}"
     }
     owners      = ["amazon"]
     most_recent = true

diff --git a/generate-release-vars.sh b/generate-release-vars.sh
@@ -71,6 +71,7 @@ distribution_release_al2023=$(curl -s https://al2023-repos-us-west-2-de612dc2.s3
 
 readonly ami_name_al2_kernel5dot10arm ami_name_al2_kernel5dot10 ami_name_al2_arm ami_name_al2_x86 ami_name_al1 ami_name_al2023_arm ami_name_al2023_x86 distribution_release_al2023
 
+# Temporarily override base AMI for AL2 GPU due to a known al2 kernel and EFA/Nvidia incompatibility
 cat >|release.auto.pkrvars.hcl <<EOF
 ami_version          = "$ami_version"
 ecs_agent_version    = "$agent_version"
@@ -84,6 +85,7 @@ source_ami_al2       = "$ami_name_al2_x86"
 source_ami_al2arm    = "$ami_name_al2_arm"
 source_ami_al2kernel5dot10    = "$ami_name_al2_kernel5dot10"
 source_ami_al2kernel5dot10arm = "$ami_name_al2_kernel5dot10arm"
+source_ami_al2_gpu   = "amzn2-ami-minimal-hvm-2.0.20230926.0-x86_64-ebs"
 source_ami_al2023    = "$ami_name_al2023_x86"
 source_ami_al2023arm = "$ami_name_al2023_arm"
 kernel_version_al2023    = "$kernel_version_al2023_x86"

diff --git a/variables.pkr.hcl b/variables.pkr.hcl
@@ -87,6 +87,12 @@ variable "source_ami_al2arm" {
   description = "Amazon Linux 2 ARM source AMI to build from."
 }
 
+variable "source_ami_al2_gpu" {
+  type        = string
+  description = "Amazon Linux 2 source AMI to build AL2GPU AMI from. This is a temporary override."
+  default     = "amzn2-ami-minimal-hvm-2.0.20230926.0-x86_64-ebs"
+}
+
 variable "source_ami_al2kernel5dot10" {
   type        = string
   description = "Amazon Linux 2 Kernel 5.10 source AMI to build from."