From adc4cfa733af86874017d07459cc5ad62bf82bd3 Mon Sep 17 00:00:00 2001
From: Andrea Frittoli <andrea.frittoli@uk.ibm.com>
Date: Mon, 26 Oct 2020 13:48:52 +0000
Subject: [PATCH] Make the main releases multi-arch

With multi-arch builds, the base image is built by a dedicated
task and should not be in the list of outputs of the publish
task. Since the publish task is shared by nightly and full
releases, the solution is to turn the full releases to multi
arch as well.

Signed-off-by: Andrea Frittoli <andrea.frittoli@uk.ibm.com>
---
 tekton/publish.yaml          |  2 --
 tekton/release-pipeline.yaml | 18 ++++++++++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/tekton/publish.yaml b/tekton/publish.yaml
index f2eb36df2e3..98a03789f4b 100644
--- a/tekton/publish.yaml
+++ b/tekton/publish.yaml
@@ -23,8 +23,6 @@ spec:
     outputs:
     - name: bucket
       type: storage
-    - name: builtBaseImage
-      type: image
     - name: builtEntrypointImage
       type: image
     - name: builtNopImage
diff --git a/tekton/release-pipeline.yaml b/tekton/release-pipeline.yaml
index 6061ade72dd..4f927c7d49f 100644
--- a/tekton/release-pipeline.yaml
+++ b/tekton/release-pipeline.yaml
@@ -85,6 +85,22 @@ spec:
         inputs:
           - name: source
             resource: source-repo
+    - name: build-base-image
+      runAfter: [build, unit-tests]
+      taskRef:
+        name: build-multiarch-base-image
+      params:
+        - name: pathToProject
+          value: $(params.package)
+        - name: imageRegistry
+          value: $(params.imageRegistry)
+      resources:
+        inputs:
+          - name: source
+            resource: source-repo
+        outputs:
+          - name: builtBaseImage
+            resource: builtBaseImage
     - name: publish-images
       runAfter: [build, unit-tests]
       taskRef:
@@ -107,8 +123,6 @@ spec:
         outputs:
           - name: bucket
             resource: bucket
-          - name: builtBaseImage
-            resource: builtBaseImage
           - name: builtEntrypointImage
             resource: builtEntrypointImage
           - name: builtNopImage