From 767283b2d97481c60ca666dc1768a7dfa417eca9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Budai?= <ondrej@budai.cz>
Date: Thu, 30 Jun 2022 13:30:04 +0200
Subject: [PATCH] packer: use 8.6 as a base for RHEL images
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Let's stay updated!

Also, let's remove 8.4 and 8.5 from Schutzfile, I strongly believe that it's
not used anywhere.

Signed-off-by: Ondřej Budai <ondrej@budai.cz>
---
 Schutzfile                          | 14 --------------
 templates/packer/worker.pkr.hcl     |  4 ++--
 tools/appsre-build-worker-packer.sh |  6 +++---
 3 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/Schutzfile b/Schutzfile
index e05cd8b85..a9a9e76b5 100644
--- a/Schutzfile
+++ b/Schutzfile
@@ -153,20 +153,6 @@
       }
     ]
   },
-  "rhel-8.4": {
-    "dependencies": {
-      "osbuild": {
-        "commit": "86123da599efa117c0a8c079212becb54b304724"
-      }
-    }
-  },
-  "rhel-8.5": {
-    "dependencies": {
-      "osbuild": {
-        "commit": "86123da599efa117c0a8c079212becb54b304724"
-      }
-    }
-  },
   "rhel-8.6": {
     "dependencies": {
       "osbuild": {
diff --git a/templates/packer/worker.pkr.hcl b/templates/packer/worker.pkr.hcl
index 449329a44..a85b4afb6 100644
--- a/templates/packer/worker.pkr.hcl
+++ b/templates/packer/worker.pkr.hcl
@@ -28,8 +28,8 @@ build {
   source "amazon-ebs.image_builder" {
     name = "rhel-8-x86_64"
 
-    # Use a static RHEL 8.5 Cloud Access Image.
-    source_ami = "ami-06f1e6f8b3457ae7c"
+    # Use a static RHEL 8.6 Cloud Access Image.
+    source_ami = "ami-03debf3ebf61b20cd"
     ssh_username = "ec2-user"
     instance_type = "c6a.large"
 
diff --git a/tools/appsre-build-worker-packer.sh b/tools/appsre-build-worker-packer.sh
index 41192384b..f1c471403 100755
--- a/tools/appsre-build-worker-packer.sh
+++ b/tools/appsre-build-worker-packer.sh
@@ -79,7 +79,7 @@ mkdir -p "$RPMBUILD_DIR"
 aws ec2 create-key-pair --key-name "$KEY_NAME" --query 'KeyMaterial' --output text > /osbuild-composer/keypair.pem
 chmod 600 /osbuild-composer/keypair.pem
 # rhel 8.5 AMI
-aws ec2 run-instances --image-id ami-06f1e6f8b3457ae7c --instance-type c5.large --key-name "$KEY_NAME" \
+aws ec2 run-instances --image-id ami-03debf3ebf61b20cd --instance-type c5.large --key-name "$KEY_NAME" \
     --tag-specifications "ResourceType=instance,Tags=[{Key=commit,Value=$COMMIT_SHA},{Key=name,Value=rpm-builder-$COMMIT_SHA}]" \
     > ./rpminstance.json
 AWS_INSTANCE_ID=$(jq -r '.Instances[].InstanceId' "rpminstance.json")
@@ -104,7 +104,7 @@ ansible-playbook \
     -i /osbuild-composer/tools/appsre-ansible/inventory \
     /osbuild-composer/tools/appsre-ansible/rpmbuild.yml \
     -e "COMPOSER_COMMIT=$COMMIT_SHA" \
-    -e "OSBUILD_COMMIT=$(jq -r '.["rhel-8.5"].dependencies.osbuild.commit' /osbuild-composer/Schutzfile)" \
+    -e "OSBUILD_COMMIT=$(jq -r '.["rhel-8.6"].dependencies.osbuild.commit' /osbuild-composer/Schutzfile)" \
     -e "RH_ACTIVATION_KEY=$RH_ACTIVATION_KEY" \
     -e "RH_ORG_ID=$RH_ORG_ID"
 EOF
@@ -165,7 +165,7 @@ EOF
         # get distro name for schutzfile
         local schutzfile_distro="$distro"
         if [[ $schutzfile_distro == rhel-8 ]]; then
-            schutzfile_distro=rhel-8.5
+            schutzfile_distro=rhel-8.6
         fi
 
         # get osbuild_commit from schutzfile