Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Temporarily override GPU base AMI #161

Merged
merged 1 commit into from
Nov 7, 2023
Merged

Temporarily override GPU base AMI #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion al2gpu.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions generate-release-vars.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we don't need to update generate-release-vars.sh since the default value for source_ami_al2_gpu is defined in variables.pkr.hcl?

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"
}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

True. This is writing to the release.autopkrvars.hcl so that releaser can see the diff and write change log though, so I would not think it is a big deal to keep it.

source_ami_al2023 = "$ami_name_al2023_x86"
source_ami_al2023arm = "$ami_name_al2023_arm"
kernel_version_al2023 = "$kernel_version_al2023_x86"
Expand Down
6 changes: 6 additions & 0 deletions variables.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
Loading