Fix repository in name generation and templates so that rawhide variants are correctly generated

cook/generate_recipe.py

@@ -228,7 +228,7 @@ def generate_filename(variant, group_name=None):
         parts.append(group_name.replace('live', ''))
     
     # Version
-    parts.append(str(variant.get('version', '43')))
+    parts.append(str(variant.get('repository', '43')))
     
     return '_'.join(parts) + '.cfg'
 

cook/recipes_manifest.yaml

@@ -3,12 +3,12 @@
 # Edit this file to add new variants, then run: make generate-recipes
 #
 # Supported syntax:
-# - Single values: version: "43"
+# - Single values: repository: "43"
-# - List values: version: ["43", "rawhide"] (expands to multiple variants)
+# - List values: repository: ["43", "rawhide"] (expands to multiple variants)
 # - List modifiers: hypervisor_type: ["amdcpu", "intelcpu"] (expands to separate variants)
 #
 # NOTE: List values create a cartesian product.
-# Example: version: ["43", "rawhide"] + storage: ["standard", "encrypted"]
+# Example: repository: ["43", "rawhide"] + storage: ["standard", "encrypted"]
 # creates 4 variants: (43,standard), (43,encrypted), (rawhide,standard), (rawhide,encrypted)
 #
 # NOTE: The 'name' field is no longer used with the universal template.
@@ -18,59 +18,55 @@ recipes:
   # Desktop variants
   - name: desktop
     variants:
-      - version: ["43", "rawhide"]
+      - repository: ["43", "rawhide"]
         desktop: gnome
         storage: ["standard", "encrypted"]
         bootloader: ["grub", "systemd-boot"]
         hardware-support: [true, false]
         guest-agents: [true, false]
-        initial-setup: server
 
-  # Server variants
+#  # Server variants
-  - name: server
+#  - name: server
-    variants:
+#    variants:
-      - version: ["43", "rawhide"]
+#      - repository: ["43", "rawhide"]
-        storage: standard
+#        storage: standard
-        bootloader: grub
+#        bootloader: grub
-        hardware-support: false
+#        hardware-support: false
-        guest-agents: true
+#        guest-agents: true
-        initial-setup: server
+#
-
+#  # Hypervisor variants
-  # Hypervisor variants
+#  - name: hypervisor
-  - name: hypervisor
+#    variants:
-    variants:
+#      - repository: 43
-      - version: 43
+#        storage: standard
-        storage: standard
+#        bootloader: grub
-        bootloader: grub
+#        hardware-support: true
-        hardware-support: true
+#        guest-agents: false
-        guest-agents: false
+#        hypervisor: base
-        hypervisor: base
+#        hypervisor_type: ["amdcpu", "intelcpu"]
-        hypervisor_type: ["amdcpu", "intelcpu"]
+#
-        initial-setup: server
+#  # Desktop-hypervisor variants
-
+#  - name: desktop-hypervisor
-  # Desktop-hypervisor variants
+#    variants:
-  - name: desktop-hypervisor
+#      - repository: 43
-    variants:
+#        desktop: gnome
-      - version: 43
+#        storage: standard
-        desktop: gnome
+#        bootloader: grub
-        storage: standard
+#        hardware-support: false
-        bootloader: grub
+#        guest-agents: true
-        hardware-support: false
+#        hypervisor: desktop
-        guest-agents: true
+#        hypervisor_type: ["amdcpu", "intelcpu"]
-        hypervisor: desktop
+#
-        hypervisor_type: ["amdcpu", "intelcpu"]
+#  # Live desktop variants
-        initial-setup: server
+#  - name: desktop-live
-
+#    variants:
-  # Live desktop variants
+#      - repository: 43
-  - name: desktop-live
+#        hardware-support: true
-    variants:
+#        guest-agents: false
-      - version: 43
+#
-        hardware-support: true
+#  # Live server variants
-        guest-agents: false
+#  - name: server-live
-
+#    variants:
-  # Live server variants
+#      - repository: 43
-  - name: server-live
+#        hardware-support: true
-    variants:
+#        guest-agents: false
-      - version: 43
-        hardware-support: true
-        guest-agents: false