From 73ceb94b51ee3a3812ebcef8de10423f672b1881 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hozza?= <thozza@redhat.com>
Date: Thu, 29 May 2025 11:21:30 +0200
Subject: [PATCH] Packer: update Fedora images to F42 and remove workarounds
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Update Fedora workers from EOL F40 to F42.

Remove workarounds that should not be needed any more (i.e. the Packer
upstream issue has been closed).

Signed-off-by: Tomáš Hozza <thozza@redhat.com>
---
 .../group_vars/all.yml                        |  0
 .../group_vars/all.yml                        |  0
 templates/packer/worker.pkr.hcl               | 42 +++++++------------
 3 files changed, 14 insertions(+), 28 deletions(-)
 rename templates/packer/ansible/inventory/{fedora-40-aarch64 => fedora-42-aarch64}/group_vars/all.yml (100%)
 rename templates/packer/ansible/inventory/{fedora-40-x86_64 => fedora-42-x86_64}/group_vars/all.yml (100%)

diff --git a/templates/packer/ansible/inventory/fedora-40-aarch64/group_vars/all.yml b/templates/packer/ansible/inventory/fedora-42-aarch64/group_vars/all.yml
similarity index 100%
rename from templates/packer/ansible/inventory/fedora-40-aarch64/group_vars/all.yml
rename to templates/packer/ansible/inventory/fedora-42-aarch64/group_vars/all.yml
diff --git a/templates/packer/ansible/inventory/fedora-40-x86_64/group_vars/all.yml b/templates/packer/ansible/inventory/fedora-42-x86_64/group_vars/all.yml
similarity index 100%
rename from templates/packer/ansible/inventory/fedora-40-x86_64/group_vars/all.yml
rename to templates/packer/ansible/inventory/fedora-42-x86_64/group_vars/all.yml
diff --git a/templates/packer/worker.pkr.hcl b/templates/packer/worker.pkr.hcl
index 027ee0bc3..946a59393 100644
--- a/templates/packer/worker.pkr.hcl
+++ b/templates/packer/worker.pkr.hcl
@@ -89,23 +89,23 @@ build {
   }
 
   source "amazon-ebs.image_builder"  {
-    name = "fedora-40-x86_64"
+    name = "fedora-42-x86_64"
 
-    # Fedora-Cloud-Base-AmazonEC2.x86_64-40-1.14-hvm-us-east-1-gp3-0
-    source_ami = "ami-004f552bba0e5f64f"
+    # Fedora-Cloud-Base-AmazonEC2.x86_64-42-1.1
+    source_ami = "ami-07df3bb06da88a158"
     ssh_username = "fedora"
     instance_type = "c6a.large"
 
     # Set a name for the resulting AMI.
-    ami_name = "${var.image_name}-fedora-40-x86_64"
+    ami_name = "${var.image_name}-fedora-42-x86_64"
 
     # Apply tags to the resulting AMI/EBS snapshot.
     tags = {
       AppCode = "IMGB-001"
-      Name = "${var.image_name}-fedora-40-x86_64"
+      Name = "${var.image_name}-fedora-42-x86_64"
       composer_commit = "${var.composer_commit}"
       os = "fedora"
-      os_version = "40"
+      os_version = "42"
       arch = "x86_64"
     }
 
@@ -116,33 +116,26 @@ build {
       volume_size           = 6
       volume_type           = "gp3"
     }
-
-    # go doesn't like modern Fedora crypto policies
-    # see https://github.com/hashicorp/packer/issues/10074
-    user_data = <<EOF
-#!/bin/bash
-update-crypto-policies --set LEGACY
-EOF
   }
 
   source "amazon-ebs.image_builder"  {
-    name = "fedora-40-aarch64"
+    name = "fedora-42-aarch64"
 
-    # Fedora-Cloud-Base-AmazonEC2.aarch64-40-20241024.0
-    source_ami = "ami-05c254a81747590f5"
+    # Fedora-Cloud-Base-AmazonEC2.aarch64-42-1.1
+    source_ami = "ami-045ca5703b2046e49"
     ssh_username = "fedora"
     instance_type = "c6g.large"
 
     # Set a name for the resulting AMI.
-    ami_name = "${var.image_name}-fedora-40-aarch64"
+    ami_name = "${var.image_name}-fedora-42-aarch64"
 
     # Apply tags to the resulting AMI/EBS snapshot.
     tags = {
       AppCode = "IMGB-001"
-      Name = "${var.image_name}-fedora-40-aarch64"
+      Name = "${var.image_name}-fedora-42-aarch64"
       composer_commit = "${var.composer_commit}"
       os = "fedora"
-      os_version = "40"
+      os_version = "42"
       arch = "aarch64"
     }
 
@@ -153,19 +146,12 @@ EOF
       volume_size           = 6
       volume_type           = "gp3"
     }
-
-    # go doesn't like modern Fedora crypto policies
-    # see https://github.com/hashicorp/packer/issues/10074
-    user_data = <<EOF
-#!/bin/bash
-update-crypto-policies --set LEGACY
-EOF
   }
 
-  # Ansible is quite broken on fedora 40, using python 3.10 + not using
+  # Ansible is quite broken on Fedora, using python 3.10+ not using
   # the dnf module seems to work.
   provisioner "shell" {
-    only = ["amazon-ebs.fedora-40-x86_64", "amazon-ebs.fedora-40-aarch64"]
+    only = ["amazon-ebs.fedora-42-x86_64", "amazon-ebs.fedora-42-aarch64"]
     inline = [
       "sudo dnf install -y python3.10",
     ]