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.

Author: src-up

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
 

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