Cloud API: Add Fedora IoT bootable container

.gitlab-ci.yml

@@ -536,6 +536,12 @@ API:
         RUNNER:
           - aws/fedora-38-x86_64
           - aws/fedora-39-x86_64
+      - IMAGE_TYPE: ["iot-bootable-container"]
+        RUNNER:
+          - aws/fedora-39-x86_64
+          - aws/fedora-39-aarch64
+          - aws/fedora-40-x86_64
+          - aws/fedora-40-aarch64
       - IMAGE_TYPE: ["aws"]
         RUNNER:
           - aws/rhel-8.8-ga-aarch64

cmd/osbuild-composer/config.go

@@ -111,6 +111,11 @@ func GetDefaultConfig() *ComposerConfigFile {
 						"gce-rhui",
 					},
 				},
+				"fedora-*": {
+					ImageTypeDenyList: []string{
+						"iot-bootable-container",
+					},
+				},
 			},
 		},
 		DistroAliases: map[string]string{

cmd/osbuild-composer/config_test.go

@@ -57,6 +57,11 @@ func TestDefaultConfig(t *testing.T) {
 					"gce-rhui",
 				},
 			},
+			"fedora-*": {
+				[]string{
+					"iot-bootable-container",
+				},
+			},
 		},
 	}
 
@@ -113,9 +118,11 @@ func TestWeldrDistrosImageTypeDenyList(t *testing.T) {
 	require.NoError(t, err)
 	require.NotNil(t, config)
 
+	// rhel config is overridden, but fedora is unaffected
 	expectedWeldrDistrosImageTypeDenyList := map[string][]string{
-		"*":       {"qcow2", "vmdk"},
-		"rhel-84": {"qcow2"},
+		"*":        {"qcow2", "vmdk"},
+		"fedora-*": {"iot-bootable-container"},
+		"rhel-84":  {"qcow2"},
 	}
 
 	require.Equal(t, expectedWeldrDistrosImageTypeDenyList, config.weldrDistrosImageTypeDenyList())

internal/cloudapi/v2/handler.go

@@ -334,6 +334,8 @@ func imageTypeFromApiImageType(it ImageTypes, arch distro.Arch) string {
 		return "rhel-edge-container"
 	case ImageTypesEdgeInstaller:
 		return "rhel-edge-installer"
+	case ImageTypesIotBootableContainer:
+		return "iot-bootable-container"
 	case ImageTypesIotCommit:
 		return "iot-commit"
 	case ImageTypesIotContainer:

internal/cloudapi/v2/imagerequest.go

@@ -287,6 +287,8 @@ func getDefaultTarget(imageType ImageTypes) (UploadTypes, error) {
 
 	case ImageTypesEdgeContainer:
 		fallthrough
+	case ImageTypesIotBootableContainer:
+		fallthrough
 	case ImageTypesIotContainer:
 		return UploadTypesContainer, nil
 
@@ -321,21 +323,23 @@ func targetSupportMap() map[UploadTypes]map[ImageTypes]bool {
 			ImageTypesAwsSapRhui: true,
 		},
 		UploadTypesAwsS3: {
-			ImageTypesGuestImage:     true,
-			ImageTypesVsphere:        true,
-			ImageTypesVsphereOva:     true,
-			ImageTypesWsl:            true,
-			ImageTypesImageInstaller: true,
-			ImageTypesEdgeInstaller:  true,
-			ImageTypesIotInstaller:   true,
-			ImageTypesLiveInstaller:  true,
-			ImageTypesEdgeCommit:     true,
-			ImageTypesIotCommit:      true,
-			ImageTypesIotRawImage:    true,
+			ImageTypesEdgeCommit:           true,
+			ImageTypesEdgeInstaller:        true,
+			ImageTypesGuestImage:           true,
+			ImageTypesImageInstaller:       true,
+			ImageTypesIotBootableContainer: true,
+			ImageTypesIotCommit:            true,
+			ImageTypesIotInstaller:         true,
+			ImageTypesIotRawImage:          true,
+			ImageTypesLiveInstaller:        true,
+			ImageTypesVsphereOva:           true,
+			ImageTypesVsphere:              true,
+			ImageTypesWsl:                  true,
 		},
 		UploadTypesContainer: {
-			ImageTypesEdgeContainer: true,
-			ImageTypesIotContainer:  true,
+			ImageTypesEdgeContainer:        true,
+			ImageTypesIotBootableContainer: true,
+			ImageTypesIotContainer:         true,
 		},
 		UploadTypesGcp: {
 			ImageTypesGcp:     true,

internal/cloudapi/v2/openapi.v2.yml

@@ -823,11 +823,12 @@ components:
         - gcp-rhui
         - guest-image
         - image-installer
+        - iot-bootable-container
         - iot-commit
         - iot-container
         - iot-installer
-        - iot-simplified-installer
         - iot-raw-image
+        - iot-simplified-installer
         - live-installer
         - oci
         - vsphere

test/cases/api.sh

@@ -34,6 +34,7 @@ export IMAGE_TYPE_GUEST="guest-image"
 export IMAGE_TYPE_OCI="oci"
 export IMAGE_TYPE_VSPHERE="vsphere"
 export IMAGE_TYPE_IOT_COMMIT="iot-commit"
+export IMAGE_TYPE_IOT_BOOTABLE_CONTAINER="iot-bootable-container"
 
 if (( $# > 2 )); then
     echo "$0 does not support more than two arguments"
@@ -107,7 +108,7 @@ case ${IMAGE_TYPE} in
     "$IMAGE_TYPE_OCI")
         CLOUD_PROVIDER="${CLOUD_PROVIDER_OCI}"
         ;;
-    "$IMAGE_TYPE_EDGE_COMMIT"|"$IMAGE_TYPE_IOT_COMMIT"|"$IMAGE_TYPE_EDGE_INSTALLER"|"$IMAGE_TYPE_IMAGE_INSTALLER"|"$IMAGE_TYPE_GUEST"|"$IMAGE_TYPE_VSPHERE")
+    "$IMAGE_TYPE_EDGE_COMMIT"|"$IMAGE_TYPE_IOT_COMMIT"|"$IMAGE_TYPE_EDGE_INSTALLER"|"$IMAGE_TYPE_IMAGE_INSTALLER"|"$IMAGE_TYPE_GUEST"|"$IMAGE_TYPE_VSPHERE"|"$IMAGE_TYPE_IOT_BOOTABLE_CONTAINER")
         # blobby image types: upload to s3 and provide download link
         CLOUD_PROVIDER="${2:-$CLOUD_PROVIDER_AWS_S3}"
         if [ "${CLOUD_PROVIDER}" != "${CLOUD_PROVIDER_AWS_S3}" ] && [ "${CLOUD_PROVIDER}" != "${CLOUD_PROVIDER_GENERIC_S3}" ]; then

test/cases/api/aws.s3.sh

@@ -47,7 +47,7 @@ function installClient() {
 
 function createReqFile() {
     case ${IMAGE_TYPE} in
-        "$IMAGE_TYPE_EDGE_COMMIT"|"$IMAGE_TYPE_IOT_COMMIT"|"$IMAGE_TYPE_EDGE_CONTAINER"|"$IMAGE_TYPE_EDGE_INSTALLER"|"$IMAGE_TYPE_IMAGE_INSTALLER")
+        "$IMAGE_TYPE_EDGE_COMMIT"|"$IMAGE_TYPE_IOT_COMMIT"|"$IMAGE_TYPE_EDGE_CONTAINER"|"$IMAGE_TYPE_EDGE_INSTALLER"|"$IMAGE_TYPE_IMAGE_INSTALLER"|"$IMAGE_TYPE_IOT_BOOTABLE_CONTAINER")
             createReqFileEdge
             ;;
         "$IMAGE_TYPE_VSPHERE")