bootc-generic-iso: Drop the bootc- part of the name

It's redundant and makes the ibcli image names longer than they need to
be.

Related: HMS-10627

Author: brlane-rht

data/distrodefs/bootc-generic/imagetypes.yaml

@@ -180,8 +180,8 @@ image_types:
   # image. Additionally, the image type is not tied to anaconda as
   # bootc-installer is. This allows users to create a very customized ISOs.
   # TODO: Discuss names of container-based isos: anaconda-iso,
-  # bootc-generic-iso and bootc-installer are all confusing.
-  bootc-generic-iso:
+  # generic-iso and bootc-installer are all confusing.
+  generic-iso:
     <<: *raw_image_type
     mime_type: "application/x-iso9660-image"
     exports: ["bootiso"]

pkg/distro/generic/bootc_test.go

@@ -469,7 +469,7 @@ var diskContainers = map[string][]container.Spec{
 	},
 }
 
-// isoContainers can be passed to Serialize() to get a minimal bootc-generic-iso image
+// isoContainers can be passed to Serialize() to get a minimal generic-iso image
 var isoContainers = map[string][]container.Spec{
 	"build": {
 		containerSpec,
@@ -721,7 +721,7 @@ func TestManifestGenerationBlueprintValidation(t *testing.T) {
 
 func TestBootcIsoManifestSerialization(t *testing.T) {
 	bd := NewTestBootcDistro(t)
-	imgType, err := bd.arches["x86_64"].GetImageType("bootc-generic-iso")
+	imgType, err := bd.arches["x86_64"].GetImageType("generic-iso")
 	assert.NoError(t, err)
 
 	bp := &blueprint.Blueprint{}
@@ -763,7 +763,7 @@ func TestContainerSourceLocality(t *testing.T) {
 				switch imgTypeName {
 				case "anaconda-iso", "iso":
 					t.Skipf("skipping %s: legacy ISO requires real distro definitions not available in the test distro", imgTypeName)
-				case "bootc-generic-iso":
+				case "generic-iso":
 					t.Skipf("skipping %s: installer payload not supported ", imgTypeName)
 				}
 

test/bootc-fake-containers.yaml

@@ -93,15 +93,15 @@ containers:
         id: "fedora"
         versionid: "42"
 
-  # test bootc-generic-iso
+  # test generic-iso
   - <<: *default_fake_container
-    image_types: ["bootc-generic-iso"]
+    image_types: ["generic-iso"]
     arch: x86_64
     info:
       <<: *default_info
       uefi_vendor: "uefi-vendor-x86_64"
   - <<: *default_fake_container
-    image_types: ["bootc-generic-iso"]
+    image_types: ["generic-iso"]
     arch: aarch64
     info:
       <<: *default_info

test/config-list.json

@@ -739,7 +739,7 @@
         "vmdk",
         "ova",
         "anaconda-iso",
-        "bootc-generic-iso",
+        "generic-iso",
         "pxe-tar-xz"
       ]
     }
@@ -770,7 +770,7 @@
         "vmdk",
         "ova",
         "anaconda-iso",
-        "bootc-generic-iso",
+        "generic-iso",
         "pxe-tar-xz"
       ]
     }

…_1-aarch64-bootc_generic_iso-bootc_empty …est_os_1-aarch64-generic_iso-bootc_emptytest/data/manifest-checksums/bootc_test_os_1-aarch64-bootc_generic_iso-bootc_empty renamed to test/data/manifest-checksums/bootc_test_os_1-aarch64-generic_iso-bootc_empty test/data/manifest-checksums/bootc_test_os_1-aarch64-bootc_generic_iso-bootc_empty renamed to test/data/manifest-checksums/bootc_test_os_1-aarch64-generic_iso-bootc_empty

@@ -558,7 +558,7 @@ def boot_image(search_path, build_config_path, keep_booted=False):
         boot_qemu(arch, image_path, build_config_path, keep_booted=keep_booted)
     elif image_type in ("image-installer", "minimal-installer"):
         boot_qemu_iso(arch, image_path, build_config_path)
-    elif image_type in ("network-installer", "everything-network-installer", "bootc-generic-iso"):
+    elif image_type in ("network-installer", "everything-network-installer", "generic-iso"):
         boot_qemu_iso_no_unattended_support(arch, image_path, build_config_path)
     elif image_type in ("pxe-tar-xz"):
         boot_qemu_pxe(arch, image_path)