example: use otk.op.join as workaround

Start using `otk.op.join` to work around duplicate keys in a map.

Signed-off-by: Simon de Vlieger <[email protected]>

example/fedora/minimal-40-aarch64.yaml

@@ -1,10 +1,10 @@
 otk.version: 1
 
 otk.define:
-  version: 40
-  architecture: "aarch64"
-
-otk.include: "minimal-common.yaml"
+  otk.op.join:
+    - version: 40
+      architecture: "aarch64"
+    - otk.include: "minimal-common.yaml"
 
 otk.target.osbuild:
   pipelines:

example/fedora/minimal-40-x86_64.yaml

@@ -1,10 +1,10 @@
 otk.version: 1
 
 otk.define:
-  version: 40
-  architecture: "x86_64"
-
-otk.include: "minimal-common.yaml"
+  otk.op.join:
+    - version: 40
+      architecture: "x86_64"
+    - otk.include: "minimal-common.yaml"
 
 otk.target.osbuild:
   pipelines:

example/fedora/minimal-common.yaml

@@ -1,40 +1,38 @@
-otk.define:
-  isolabel: Fedora-${version}-${architecture}
-
-  packages:
-    # Repositories to fetch packages from
-    repositories:
-      otk.include: "repository/${version}/repositories.yaml"
-    # GPG keys to verify packages with
-    keys:
-      otk.include: "repository/${version}/keys.yaml"
-    # These packages are used in the buildroot
-    buildroot:
-      docs: false
-      weak: false
-      packages:
-        otk.include: "packages/${version}/_buildroot.yaml"
-    # These packages are used for the operating system tree which is what ends
-    # up in the outputs.
-    tree:
-      docs: false
-      weak: false
-      packages:
-        otk.include: "packages/${version}/minimal.yaml"
-  filesystem:
-    root:
-      uuid: "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"
-      vfs_type: "ext4"
-      path: "/"
-      options: "defaults"
-    boot:
-      uuid: "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
-      vfs_type: "ext4"
-      path: "/boot"
-      options: "defaults"
-    boot-efi:
-      uuid: "7B77-95E7"
-      vfs_type: "vfat"
-      path: "/boot/efi"
-      options: "defaults,uid=0,gid=0,umask=077,shortname=winnt"
-      passno: 2
+isolabel: Fedora-${version}-${architecture}
+packages:
+  # Repositories to fetch packages from
+  repositories:
+    otk.include: "repository/${version}/repositories.yaml"
+  # GPG keys to verify packages with
+  keys:
+    otk.include: "repository/${version}/keys.yaml"
+  # These packages are used in the buildroot
+  buildroot:
+    docs: false
+    weak: false
+    packages:
+      otk.include: "packages/${version}/_buildroot.yaml"
+  # These packages are used for the operating system tree which is what ends
+  # up in the outputs.
+  tree:
+    docs: false
+    weak: false
+    packages:
+      otk.include: "packages/${version}/minimal.yaml"
+filesystem:
+  root:
+    uuid: "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"
+    vfs_type: "ext4"
+    path: "/"
+    options: "defaults"
+  boot:
+    uuid: "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
+    vfs_type: "ext4"
+    path: "/boot"
+    options: "defaults"
+  boot-efi:
+    uuid: "7B77-95E7"
+    vfs_type: "vfat"
+    path: "/boot/efi"
+    options: "defaults,uid=0,gid=0,umask=077,shortname=winnt"
+    passno: 2