From 7cf98cfbf19007dc5d3a5b8b835f100f6ef517e9 Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
Date: Wed, 10 Jan 2024 16:49:44 -0500
Subject: [PATCH] manifests: remove partition UUIDs from fcos container
 manifest

We don't set the UUIDs today in COSA/create_disk.sh so let's not
statically set them here either. This means they'll get set to
something random.
---
 .../manifests/fedora-coreos-container.json    | 24 +++++++------------
 .../fedora-coreos-container.mpp.yaml          |  8 -------
 2 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/test/data/manifests/fedora-coreos-container.json b/test/data/manifests/fedora-coreos-container.json
index 843990e8..f1476c21 100644
--- a/test/data/manifests/fedora-coreos-container.json
+++ b/test/data/manifests/fedora-coreos-container.json
@@ -563,29 +563,25 @@
                 "size": 2048,
                 "type": "21686148-6449-6E6F-744E-656564454649",
                 "bootable": true,
-                "name": "BIOS-BOOT",
-                "uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549"
+                "name": "BIOS-BOOT"
               },
               {
                 "start": 4096,
                 "size": 260096,
                 "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
-                "name": "EFI-SYSTEM",
-                "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
+                "name": "EFI-SYSTEM"
               },
               {
                 "start": 264192,
                 "size": 786432,
                 "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
-                "name": "boot",
-                "uuid": "61B2905B-DF3E-4FB3-80FA-49D1E773AA32"
+                "name": "boot"
               },
               {
                 "start": 1050624,
                 "size": 4194304,
                 "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
-                "name": "root",
-                "uuid": "CA7D7CCB-63ED-4C53-861C-1742536059CC"
+                "name": "root"
               }
             ]
           }
@@ -774,29 +770,25 @@
                 "size": 256,
                 "type": "21686148-6449-6E6F-744E-656564454649",
                 "bootable": true,
-                "name": "BIOS-BOOT",
-                "uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549"
+                "name": "BIOS-BOOT"
               },
               {
                 "start": 512,
                 "size": 32512,
                 "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
-                "name": "EFI-SYSTEM",
-                "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
+                "name": "EFI-SYSTEM"
               },
               {
                 "start": 33024,
                 "size": 98304,
                 "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
-                "name": "boot",
-                "uuid": "61B2905B-DF3E-4FB3-80FA-49D1E773AA32"
+                "name": "boot"
               },
               {
                 "start": 131328,
                 "size": 524288,
                 "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
-                "name": "root",
-                "uuid": "CA7D7CCB-63ED-4C53-861C-1742536059CC"
+                "name": "root"
               }
             ]
           }
diff --git a/test/data/manifests/fedora-coreos-container.mpp.yaml b/test/data/manifests/fedora-coreos-container.mpp.yaml
index d37a969a..b7f2d996 100644
--- a/test/data/manifests/fedora-coreos-container.mpp.yaml
+++ b/test/data/manifests/fedora-coreos-container.mpp.yaml
@@ -18,22 +18,18 @@ mpp-define-images:
         - name: BIOS-BOOT
           type: 21686148-6449-6E6F-744E-656564454649
           bootable: true
-          uuid: FAC7F1FB-3E8D-4137-A512-961DE09A5549
           size:
             mpp-format-int: "{bios_boot_size_mb * 1024 * 1024 / sector_size}"
         - name: EFI-SYSTEM
           type: C12A7328-F81F-11D2-BA4B-00A0C93EC93B
-          uuid: 68B2905B-DF3E-4FB3-80FA-49D1E773AA33
           size:
             mpp-format-int: "{efi_system_size_mb * 1024 * 1024 / sector_size}"
         - name: boot
           type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
-          uuid: 61B2905B-DF3E-4FB3-80FA-49D1E773AA32
           size:
             mpp-format-int: "{boot_size_mb * 1024 * 1024 / sector_size}"
         - name: root
           type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
-          uuid: CA7D7CCB-63ED-4C53-861C-1742536059CC
           size:
             mpp-format-int: "{root_size_mb * 1024 * 1024 / sector_size}"
   - id: image4k
@@ -48,22 +44,18 @@ mpp-define-images:
         - name: BIOS-BOOT
           type: 21686148-6449-6E6F-744E-656564454649
           bootable: true
-          uuid: FAC7F1FB-3E8D-4137-A512-961DE09A5549
           size:
             mpp-format-int: "{bios_boot_size_mb * 1024 * 1024 / four_k_sector_size}"
         - name: EFI-SYSTEM
           type: C12A7328-F81F-11D2-BA4B-00A0C93EC93B
-          uuid: 68B2905B-DF3E-4FB3-80FA-49D1E773AA33
           size:
             mpp-format-int: "{efi_system_size_mb * 1024 * 1024 / four_k_sector_size}"
         - name: boot
           type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
-          uuid: 61B2905B-DF3E-4FB3-80FA-49D1E773AA32
           size:
             mpp-format-int: "{boot_size_mb * 1024 * 1024 / four_k_sector_size}"
         - name: root
           type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
-          uuid: CA7D7CCB-63ED-4C53-861C-1742536059CC
           size:
             mpp-format-int: "{root_size_mb * 1024 * 1024 / four_k_sector_size}"
 pipelines: