From 3b11df874f2d6ac486ddab0a4760a1aa1af1f494 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20Mass=C3=A9?= <nicolas.masse@itix.fr>
Date: Thu, 2 May 2024 22:36:50 +0200
Subject: [PATCH] simplify quarkus pipeline

---
 examples/quarkus/tekton/pipeline.yaml    | 43 +++---------------------
 examples/quarkus/tekton/pipelinerun.yaml |  8 -----
 2 files changed, 5 insertions(+), 46 deletions(-)

diff --git a/examples/quarkus/tekton/pipeline.yaml b/examples/quarkus/tekton/pipeline.yaml
index 1b85224..7d59429 100644
--- a/examples/quarkus/tekton/pipeline.yaml
+++ b/examples/quarkus/tekton/pipeline.yaml
@@ -24,7 +24,7 @@ spec:
 
   tasks:
 
-  - name: clone-repo-x86-64
+  - name: clone-repo
     taskRef:
       kind: ClusterTask
       name: git-clone
@@ -36,39 +36,9 @@ spec:
     workspaces:
     - name: output
       workspace: sources
-      subPath: src-x86_64
 
-  - name: clone-repo-aarch64
-    taskRef:
-      kind: ClusterTask
-      name: git-clone
-    params:
-    - name: url
-      value: $(params.git-url)
-    - name: revision
-      value: "main"
-    workspaces:
-    - name: output
-      workspace: sources
-      subPath: src-aarch64
-
-  - name: maven-package-x86-64
-    runAfter: ["clone-repo-x86-64"]
-    taskRef:
-      kind: ClusterTask
-      name: maven
-    params:
-    - name: CONTEXT_DIR
-      value: $(params.context-dir)
-    workspaces:
-    - name: source
-      workspace: sources
-      subPath: src-x86_64
-    - name: maven-settings
-      workspace: maven-settings
-
-  - name: maven-package-aarch64
-    runAfter: ["clone-repo-aarch64"]
+  - name: maven-package
+    runAfter: ["clone-repo"]
     taskRef:
       kind: ClusterTask
       name: maven
@@ -78,12 +48,11 @@ spec:
     workspaces:
     - name: source
       workspace: sources
-      subPath: src-aarch64
     - name: maven-settings
       workspace: maven-settings
 
   - name: build-x86-64
-    runAfter: ["maven-package-x86-64"]
+    runAfter: ["maven-package"]
     taskRef:
       name: buildah-build
     params:
@@ -94,12 +63,11 @@ spec:
     workspaces:
     - name: source-workspace
       workspace: sources
-      subPath: src-aarch64
     - name: oci-images
       workspace: oci-images
   
   - name: build-aarch64
-    runAfter: ["maven-package-aarch64"]
+    runAfter: ["maven-package"]
     taskRef:
       name: buildah-build
     params:
@@ -110,7 +78,6 @@ spec:
     workspaces:
     - name: source-workspace
       workspace: sources
-      subPath: src-aarch64
     - name: oci-images
       workspace: oci-images
 
diff --git a/examples/quarkus/tekton/pipelinerun.yaml b/examples/quarkus/tekton/pipelinerun.yaml
index 3ae9837..d410209 100644
--- a/examples/quarkus/tekton/pipelinerun.yaml
+++ b/examples/quarkus/tekton/pipelinerun.yaml
@@ -41,14 +41,6 @@ spec:
   taskRunTemplate:
     serviceAccountName: buildbot
   taskRunSpecs:
-  - pipelineTaskName: maven-package-x86-64
-    podTemplate:
-      nodeSelector:
-        beta.kubernetes.io/arch: amd64
-  - pipelineTaskName: maven-package-aarch64
-    podTemplate:
-      nodeSelector:
-        beta.kubernetes.io/arch: arm64
   - pipelineTaskName: build-x86-64
     podTemplate:
       nodeSelector: