From bcd9757545109f97a7144a7663466e12286a8c0a Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@fedoraproject.org>
Date: May 08 2024 11:33:40 +0000
Subject: Improve container version detection process


Some minor improvements around container version and release
detection.

Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>

---

diff --git a/sync-bootc-base-containers.sh b/sync-bootc-base-containers.sh
index 7e9b0e1..f2272f9 100755
--- a/sync-bootc-base-containers.sh
+++ b/sync-bootc-base-containers.sh
@@ -69,6 +69,7 @@ fi
 
 basename="Fedora-IoT-bootc"
 format="oci-archive"
+vers=${1}
 compose=${2}
 compdate=`echo ${compose} | cut -c 4-`
 
@@ -78,7 +79,7 @@ compdate=`echo ${compose} | cut -c 4-`
 #   Can't currently query koji for runroot tasks as they're not tagged
 #
 # base_build_nvr=$(koji -q latest-build --type=image f${1}-updates-candidate ${basename} | awk '{print $1}')
-base_build_nvr=${basename}-${compose}
+base_build_nvr=${basename}-${vers}-${compdate}
 
 if [[ ${1} -eq "$current_stable" ]]; then
     tagname="latest"
@@ -140,8 +141,8 @@ find_and_copy_images() {
         exit 1
     fi
     # Check both architectures completed in the build else exit
-    if [ ! -f "/mnt/koji/compose/iot/Fedora-IoT-${release}-${compdate}/compose/bootc/x86_64/images/${basename}-${compose}.ociarchive" ] && \
-            [ ! -f "/mnt/koji/compose/iot/Fedora-IoT-${release}-${compdate}/compose/bootc/aarch64/images/${basename}-${compose}.ociarchive" ]; then
+    if [ ! -f "/mnt/koji/compose/iot/Fedora-IoT-${release}-${compdate}/compose/bootc/x86_64/images/${basename}-${release}.${compdate}.ociarchive" ] && \
+            [ ! -f "/mnt/koji/compose/iot/Fedora-IoT-${release}-${compdate}/compose/bootc/aarch64/images/${basename}-${release}.${compdate}.ociarchive" ]; then
         echo "One of the expected images are missing, exiting."
 	exit 1
     fi
@@ -151,7 +152,7 @@ find_and_copy_images() {
     # Import the image
     for arch in "${ARCHES[@]}"; do
         local filename
-        filename="/mnt/koji/compose/iot/Fedora-IoT-${release}-${compdate}/compose/bootc/${arch}/images/${basename}-${compose}.ociarchive"
+        filename="/mnt/koji/compose/iot/Fedora-IoT-${release}-${compdate}/compose/bootc/${arch}/images/${basename}-${release}.${compdate}.ociarchive"
         copy_image ${format}:${filename} ${registry_name}:${release}-${arch}
     done
 
@@ -171,7 +172,9 @@ if [[ ${1} -gt "$current_rawhide" ]]; then
     exit 1
 fi
 
+printf "Syncing compose contailers: ${vers} : ${compose}\n"
+
 # For fedora-bootc
 if [[ -n ${base_build_nvr} ]]; then
-    find_and_copy_images ${base_build_nvr} fedora-bootc ${1} ${compose}
+    find_and_copy_images ${base_build_nvr} fedora-bootc ${vers} ${compose}
 fi