From a4e9602ca92c2d94c640fd305806d13767b67d81 Mon Sep 17 00:00:00 2001
From: "Dustin C. Hatch" <dustin@hatch.name>
Date: Tue, 24 Oct 2023 18:44:08 -0500
Subject: [PATCH] buildContainerImage2: Unstash single-arch image

If the image being built is only for a single architecture, the step to
unstash the OCI archive file was missing.  This caused the build to fail
at the Push step, since there was noting to push.
---
 vars/buildContainerImage2.groovy | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/vars/buildContainerImage2.groovy b/vars/buildContainerImage2.groovy
index f120027..0d305e3 100644
--- a/vars/buildContainerImage2.groovy
+++ b/vars/buildContainerImage2.groovy
@@ -53,7 +53,7 @@ def call(args) {
                         sh "buildah manifest create '${full_name}'"
                         archlist.each { arch ->
                             unstash arch
-                            sh "buildah manifest add '${full_name}' oci-archive:\${PWD}/${escapeImageName(name)}-${arch}.tar"
+                            sh "buildah manifest add '${full_name}' oci-archive:\${PWD}/${escapeImageName(name)}-${arch}.tar:${full_name}"
                         }
                     }
                 }
@@ -65,6 +65,10 @@ def call(args) {
                             sh "buildah manifest push ${full_name} docker://${repo}:latest"
                         }
                     } else {
+                        archlist.each { arch ->
+                            unstash arch
+                            sh "buildah pull oci-archive:\${PWD}/${escapeImageName(name)}-${arch}.tar:${full_name}"
+                        }
                         sh "buildah push ${full_name} ${full_name}-${env.BUILD_NUMBER}"
                         sh "buildah push ${full_name}"
                         if (env.BRANCH_NAME == 'main') {
@@ -89,7 +93,7 @@ def buildStage(args) {
         container('buildah') {
             withBuildahCreds(registry) {
                 sh "buildah build -t '${full_name}' ."
-                sh "buildah push '${full_name}' oci-archive:\${PWD}/${escapeImageName(name)}-${arch}.tar"
+                sh "buildah push '${full_name}' oci-archive:\${PWD}/${escapeImageName(name)}-${arch}.tar:${full_name}"
                 stash name: arch, includes: "${escapeImageName(name)}-*.tar"
             }
         }