From 1de421aca3cbe93fdacad846a9d96eeab57fef15 Mon Sep 17 00:00:00 2001
From: Paul Whalen <pwhalen@fedoraproject.org>
Date: Jul 15 2024 17:13:55 +0000
Subject: F41: Add ppc64le and s390x to bootc images


Signed-off-by: Paul Whalen <pwhalen@fedoraproject.org>

---

diff --git a/fedora-iot.conf b/fedora-iot.conf
index d44a735..99c08de 100644
--- a/fedora-iot.conf
+++ b/fedora-iot.conf
@@ -19,7 +19,7 @@ sigkeys = ['e99d6ad1']
 
 # limit tree architectures
 # if undefined, all architectures from variants.xml will be included
-tree_arches = ['aarch64', 'x86_64']
+tree_arches = ['aarch64', 'x86_64', "ppc64le", "s390x"]
 # limit tree variants
 # if undefined, all variants from variants.xml will be included
 tree_variants = ['IoT', 'bootc', 'bootc-tier0']
@@ -279,7 +279,7 @@ ostree_container = {
         "config_branch": "main",
         "treefile": "fedora-bootc.yaml",
         "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"],
-        "arches": ["x86_64", "aarch64"],
+        "arches": ["x86_64", "aarch64", "ppc64le", "s390x"],
         "failable": ['*'],
     },
     "^bootc-tier0$": {
@@ -288,7 +288,7 @@ ostree_container = {
         "config_branch": "main",
         "treefile": "fedora-tier-0.yaml",
         "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"],
-        "arches": ["x86_64", "aarch64"],
+        "arches": ["x86_64", "aarch64", "ppc64le", "s390x"],
         "failable": ['*'],
     },
 }
diff --git a/sync-bootc-base-containers.sh b/sync-bootc-base-containers.sh
index f2272f9..d5a65d2 100755
--- a/sync-bootc-base-containers.sh
+++ b/sync-bootc-base-containers.sh
@@ -33,7 +33,7 @@ EXAMPLE
 EOF
 }
 
-ARCHES=("aarch64" "x86_64")
+ARCHES=("aarch64" "x86_64" "ppc64le" "s390x")
 
 arch_to_goarch() {
     local a=$1; shift
@@ -41,6 +41,8 @@ arch_to_goarch() {
     case "$a" in
         aarch64) echo arm64 ;;
         x86_64) echo amd64 ;;
+        ppc64le) echo ppc64le ;;
+        s390x) echo s390x ;;
         *) echo $a ;;
     esac
 }
@@ -140,9 +142,9 @@ find_and_copy_images() {
         printf "Unexpected image type! If we added a new one, it needs mapping here"
         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}-${release}.${compdate}.ociarchive" ] && \
-            [ ! -f "/mnt/koji/compose/iot/Fedora-IoT-${release}-${compdate}/compose/bootc/aarch64/images/${basename}-${release}.${compdate}.ociarchive" ]; then
+    # Check that all architectures completed in the build else exit
+    for arch in "${ARCHES[@]}"; do
+	    if [ ! -f "/mnt/koji/compose/iot/Fedora-IoT-${release}-${compdate}/compose/bootc/${arch}/images/${basename}-${release}.${compdate}.ociarchive" ]; then
         echo "One of the expected images are missing, exiting."
 	exit 1
     fi
diff --git a/variants-fedora.xml b/variants-fedora.xml
index c4f1d2f..462c3ea 100644
--- a/variants-fedora.xml
+++ b/variants-fedora.xml
@@ -11,12 +11,16 @@
         <arches>
             <arch>aarch64</arch>
             <arch>x86_64</arch>
+            <arch>ppc64le</arch>
+            <arch>s390x</arch>
         </arches>
     </variant>
     <variant id="bootc-tier0" name="bootc-tier0" type="variant" is_empty="true">
         <arches>
             <arch>aarch64</arch>
             <arch>x86_64</arch>
+            <arch>ppc64le</arch>
+            <arch>s390x</arch>
         </arches>
     </variant>
 </variants>