diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d7f640f47..78e5afb46 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -602,7 +602,7 @@ API: - aws/rhel-8.7-nightly-x86_64 - aws/rhel-9.1-nightly-x86_64 INTERNAL_NETWORK: ["true"] - - IMAGE_TYPE: ["edge-commit"] + - IMAGE_TYPE: ["iot-commit"] RUNNER: - aws/fedora-35-x86_64 - aws/fedora-36-x86_64 diff --git a/test/cases/api.sh b/test/cases/api.sh index c84f6df99..d8fe82403 100755 --- a/test/cases/api.sh +++ b/test/cases/api.sh @@ -35,6 +35,7 @@ export IMAGE_TYPE_GCP="gcp" export IMAGE_TYPE_IMAGE_INSTALLER="image-installer" export IMAGE_TYPE_GUEST="guest-image" export IMAGE_TYPE_VSPHERE="vsphere" +export IMAGE_TYPE_IOT_COMMIT="iot-commit" if (( $# > 2 )); then echo "$0 does not support more than two arguments" @@ -66,7 +67,7 @@ case ${IMAGE_TYPE} in "$IMAGE_TYPE_EDGE_CONTAINER") CLOUD_PROVIDER="${CLOUD_PROVIDER_CONTAINER_IMAGE_REGISTRY}" ;; - "$IMAGE_TYPE_EDGE_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") # 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 29cd5bc9d..12723f8f5 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_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") createReqFileEdge ;; "$IMAGE_TYPE_VSPHERE") @@ -90,7 +90,7 @@ function verify() { # Download the object using the Presigned URL and inspect case ${IMAGE_TYPE} in - "$IMAGE_TYPE_EDGE_COMMIT") + "$IMAGE_TYPE_EDGE_COMMIT"|"${IMAGE_TYPE_IOT_COMMIT}") if [[ $ID == "fedora" ]]; then # on Fedora, the test case uploads the artifact publicly, # so check here that the URL isn't presigned diff --git a/test/cases/api/common/s3.sh b/test/cases/api/common/s3.sh index d88461c9d..0a924369f 100644 --- a/test/cases/api/common/s3.sh +++ b/test/cases/api/common/s3.sh @@ -121,7 +121,7 @@ function createReqFileVSphere() { EOF } -# verify edge commit content +# verify edge/iot commit content function verifyEdgeCommit() { filename="$1" greenprint "Verifying contents of ${filename}"