test: Fixes for 8.5-ga

test/cases/api.sh

@@ -404,13 +404,13 @@ case "$ID-$VERSION_ID" in
       SSH_USER="cloud-user"
     fi
     ;;
-  "rhel-8.4")
-    DISTRO="rhel-84"
-    SSH_USER="cloud-user"
-    ;;
-  "rhel-8.2" | "rhel-8.3")
-    DISTRO="rhel-8"
-    SSH_USER="cloud-user"
+  "rhel-8.5")
+    DISTRO="rhel-85"
+    if [[ "$CLOUD_PROVIDER" == "$CLOUD_PROVIDER_AWS" ]]; then
+      SSH_USER="ec2-user"
+    else
+      SSH_USER="cloud-user"
+    fi
     ;;
   "fedora-33")
     DISTRO="fedora-33"

test/cases/koji.sh

@@ -49,7 +49,7 @@ koji --server=http://localhost:8080/kojihub --user kojiadmin --password kojipass
 
 # Always build the latest RHEL - that suits the koji API usecase the most.
 if [[ "$DISTRO_CODE" == rhel-8* ]]; then
-  DISTRO_CODE=rhel-85
+  DISTRO_CODE=rhel-86
 fi
 
 greenprint "Pushing compose to Koji"

test/cases/ostree.sh

@@ -21,12 +21,12 @@ case "${ID}-${VERSION_ID}" in
         USER_IN_COMMIT="false"
         BOOT_LOCATION="https://mirrors.rit.edu/fedora/fedora/linux/releases/33/Everything/x86_64/os/"
         ;;
-    "rhel-8.4")
+    "rhel-8.5")
         IMAGE_TYPE=rhel-edge-commit
         OSTREE_REF="rhel/8/${ARCH}/edge"
-        OS_VARIANT="rhel8.4"
-        USER_IN_COMMIT="false"
-        BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-8/RHEL-8/8.4.0/BaseOS/x86_64/os/"
+        OS_VARIANT="rhel8.5"
+        USER_IN_COMMIT="true"
+        BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-8/RHEL-8/8.5.0/BaseOS/x86_64/os/"
         ;;
     "rhel-8.6")
         IMAGE_TYPE=edge-commit