From 76a699653aab67be16c3bc5ae686f656c71e5e5d Mon Sep 17 00:00:00 2001
From: Achilleas Koutsou <achilleas@koutsou.net>
Date: Fri, 26 Jan 2024 12:51:40 +0100
Subject: [PATCH] test: add iot-bootable-container to api tests

The image type supports uploading to both s3 and container registries.
Right now we only care about getting it in Koji, so let's just add it to
the s3 upload section.

The container registry test also embeds containers in the image, which
the iot-bootable-container doesn't support (yet).
---
 .gitlab-ci.yml           | 6 ++++++
 test/cases/api.sh        | 3 ++-
 test/cases/api/aws.s3.sh | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a34bb932f..cc706d919 100644
--- a/.gitlab-ci.yml
+++ b/.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.9-ga-aarch64
diff --git a/test/cases/api.sh b/test/cases/api.sh
index 12d0aeed3..a0dd44497 100755
--- a/test/cases/api.sh
+++ b/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
diff --git a/test/cases/api/aws.s3.sh b/test/cases/api/aws.s3.sh
index 12723f8f5..39afb871e 100644
--- a/test/cases/api/aws.s3.sh
+++ b/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")