From 822a2781c60e21e22450007ec37d9d749b21ad43 Mon Sep 17 00:00:00 2001
From: Simran Singh <simsingh@redhat.com>
Date: Thu, 25 Jun 2026 09:51:17 +0530
Subject: [PATCH] include oca in rhel9, 10 image definitions

In the case of the cloud-agent, it would be better to have the package
in all the images by default, so not in the pungi configs.
---
 data/distrodefs/rhel-10/imagetypes.yaml          | 16 ++++++++++++++--
 data/distrodefs/rhel-9/imagetypes.yaml           | 13 ++++++++++++-
 .../rhel_10.2-x86_64-oci-empty                   |  2 +-
 .../rhel_10.3-x86_64-oci-empty                   |  2 +-
 .../manifest-checksums/rhel_9.8-x86_64-oci-empty |  2 +-
 .../manifest-checksums/rhel_9.9-x86_64-oci-empty |  2 +-
 6 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/data/distrodefs/rhel-10/imagetypes.yaml b/data/distrodefs/rhel-10/imagetypes.yaml
index 1a97666a0f..2242e270be 100644
--- a/data/distrodefs/rhel-10/imagetypes.yaml
+++ b/data/distrodefs/rhel-10/imagetypes.yaml
@@ -1030,9 +1030,10 @@ image_types:
                     enabled: false
     partition_table:
       <<: *default_partition_tables
-    package_sets:
+    package_sets: &qcow2_package_sets
       os:
-        - include:
+        - &qcow2_pkgset
+          include:
             - "@core"
             - "chrony"
             - "cloud-init"
@@ -1248,6 +1249,17 @@ image_types:
                     label: "root"
                     mountpoint: "/"
                     fstab_options: "defaults"
+    package_sets:
+      os:
+        - *qcow2_pkgset
+        - conditions:
+            "oracle-cloud-agent on rhel":
+              when:
+                distro_name: "rhel"
+                version_greater_or_equal: "10.2"
+              append:
+                include:
+                  - "oracle-cloud-agent"
     blueprint:
       supported_options: *supported_options_disk
 
diff --git a/data/distrodefs/rhel-9/imagetypes.yaml b/data/distrodefs/rhel-9/imagetypes.yaml
index 3e85c5b82a..904858110f 100644
--- a/data/distrodefs/rhel-9/imagetypes.yaml
+++ b/data/distrodefs/rhel-9/imagetypes.yaml
@@ -1562,7 +1562,7 @@ image_types:
                     enabled: false
     partition_table:
       <<: *default_partition_tables
-    package_sets:
+    package_sets: &qcow2_package_sets
       os:
         - &qcow2_pkgset
           include:
@@ -1778,6 +1778,17 @@ image_types:
                     label: "root"
                     mountpoint: "/"
                     fstab_options: "defaults"
+    package_sets:
+      os:
+        - *qcow2_pkgset
+        - conditions:
+            "oracle-cloud-agent on rhel":
+              when:
+                distro_name: "rhel"
+                version_greater_or_equal: "9.8"
+              append:
+                include:
+                  - "oracle-cloud-agent"
     blueprint:
       supported_options: *supported_options_disk
 
diff --git a/test/data/manifest-checksums/rhel_10.2-x86_64-oci-empty b/test/data/manifest-checksums/rhel_10.2-x86_64-oci-empty
index 1f2ddb6343..31d069a591 100644
--- a/test/data/manifest-checksums/rhel_10.2-x86_64-oci-empty
+++ b/test/data/manifest-checksums/rhel_10.2-x86_64-oci-empty
@@ -1 +1 @@
-80a8443550f7673050011a1add66b5989e40afa2
+6b7c02f01fbe2065b7b71550d5106a4842e37df6
diff --git a/test/data/manifest-checksums/rhel_10.3-x86_64-oci-empty b/test/data/manifest-checksums/rhel_10.3-x86_64-oci-empty
index b6eceaecb7..88cb9527f5 100644
--- a/test/data/manifest-checksums/rhel_10.3-x86_64-oci-empty
+++ b/test/data/manifest-checksums/rhel_10.3-x86_64-oci-empty
@@ -1 +1 @@
-ae4318fd6432ccd9acb5d2fad6201acdc9565fb2
+9c3dce1b9b791fb4f96794390e08ecb256ac96e0
diff --git a/test/data/manifest-checksums/rhel_9.8-x86_64-oci-empty b/test/data/manifest-checksums/rhel_9.8-x86_64-oci-empty
index bc2f6fcfe0..7a09caa7a7 100644
--- a/test/data/manifest-checksums/rhel_9.8-x86_64-oci-empty
+++ b/test/data/manifest-checksums/rhel_9.8-x86_64-oci-empty
@@ -1 +1 @@
-6d90b993e5a9e8a230cad2a98260701122141007
+4e97bceb8a297ba7a824543e1087480812159577
diff --git a/test/data/manifest-checksums/rhel_9.9-x86_64-oci-empty b/test/data/manifest-checksums/rhel_9.9-x86_64-oci-empty
index f6494d0c82..7a4f276be1 100644
--- a/test/data/manifest-checksums/rhel_9.9-x86_64-oci-empty
+++ b/test/data/manifest-checksums/rhel_9.9-x86_64-oci-empty
@@ -1 +1 @@
-1c054e81c4ae13509a40e0da78b2451499efddae
+cfb12578852bdae08af46028df049aef370bcca1