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

chore(ubuntu): Use pinned aws base AMI IDs from images-versions.yaml #1472

Merged
merged 2 commits into from
Oct 24, 2024
Merged

chore(ubuntu): Use pinned aws base AMI IDs from images-versions.yaml #1472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8cd8c4e
feat(ubuntu):Pin ubuntu 22.04 AMI ids
jayfranco999 Oct 24, 2024
4a2ea9e
fixup
jayfranco999 Oct 24, 2024
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 build-jenkins-agent-ubuntu.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ build {
name = "ubuntu"
ssh_username = "ubuntu"
# Egg-and-chicken: what is the base image to start from (eg. what is my egg)?
source_ami = local.aws_ubuntu_amis[var.architecture]
source_ami = try(local.images_versions["aws"]["ubuntu"][var.agent_os_version][var.architecture], "N/A")
}

source "azure-arm.base" {
Expand Down
5 changes: 0 additions & 5 deletions locals.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,6 @@ locals {
"arm64" = "t4g.xlarge"
}
# TODO: track AMI versions with `updatecli`
# Uses aws ec2 describe-images to fetch the ami id as per the architecture
aws_ubuntu_amis = {
"amd64" = "ami-00eb69d236edcfaf8"
"arm64" = "ami-039e419d24a37cb82"
}
# List available SKUs with the command `az vm image list-skus --offer 0001-com-ubuntu-server-jammy --location eastus --publisher canonical --output table`
az_instance_image_sku = {
"amd64" = "${local.agent_os_version_safe}-lts-gen2"
Expand Down