Skip to content

Commit

Permalink
templates/packer: switch to fedora-39
Browse files Browse the repository at this point in the history
Fedora 38 is EOL, and packit no longer builds rpms for it.
  • Loading branch information
croissanne committed May 23, 2024
1 parent d8a0cfe commit 73e6bc0
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 14 deletions.
25 changes: 12 additions & 13 deletions templates/packer/worker.pkr.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -93,23 +93,23 @@ build {
}

source "amazon-ebs.image_builder" {
name = "fedora-38-x86_64"
name = "fedora-39-x86_64"

# Use a static Fedora 38 Cloud Base Image.
source_ami = "ami-01752495da7056fa9"
# Fedora-Cloud-Base-39
source_ami = "ami-048e58e08c5dafb10"
ssh_username = "fedora"
instance_type = "c6a.large"

# Set a name for the resulting AMI.
ami_name = "${var.image_name}-fedora-38-x86_64"
ami_name = "${var.image_name}-fedora-39-x86_64"

# Apply tags to the resulting AMI/EBS snapshot.
tags = {
AppCode = "IMGB-001"
Name = "${var.image_name}-fedora-38-x86_64"
Name = "${var.image_name}-fedora-39-x86_64"
composer_commit = "${var.composer_commit}"
os = "fedora"
os_version = "38"
os_version = "39"
arch = "x86_64"
}

Expand All @@ -130,24 +130,23 @@ EOF
}

source "amazon-ebs.image_builder" {
name = "fedora-38-aarch64"
name = "fedora-39-aarch64"

# Use a static Fedora 38 Cloud Base Image.
# Fedora-Cloud-Base-38-1.5
source_ami = "ami-046ab62d59c5a451c"
# Fedora-Cloud-Base-39-1.5
source_ami = "ami-0e5fb025cb36c614b"
ssh_username = "fedora"
instance_type = "c6g.large"

# Set a name for the resulting AMI.
ami_name = "${var.image_name}-fedora-38-aarch64"
ami_name = "${var.image_name}-fedora-39-aarch64"

# Apply tags to the resulting AMI/EBS snapshot.
tags = {
AppCode = "IMGB-001"
Name = "${var.image_name}-fedora-38-aarch64"
Name = "${var.image_name}-fedora-39-aarch64"
composer_commit = "${var.composer_commit}"
os = "fedora"
os_version = "38"
os_version = "39"
arch = "aarch64"
}

Expand Down
2 changes: 1 addition & 1 deletion tools/appsre-build-fedora-worker-packer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export BUILD_RPMS=false
# Fedora community workers use osbuild form rpmrepo + composer from
# copr, as the osbuild rpms from copr disappear too quickly.
export ANSIBLE_TAGS="fedora"
FEDORA=fedora-38
FEDORA=fedora-39
export PACKER_ONLY_EXCEPT=--only=amazon-ebs."$FEDORA"-x86_64,amazon-ebs."$FEDORA"-aarch64
COMMIT_SHA="${COMMIT_SHA:-$(git rev-parse HEAD)}"

Expand Down

0 comments on commit 73e6bc0

Please sign in to comment.