From 898fe0f6f1e01a79f559d1173c5ed1d9f63414e2 Mon Sep 17 00:00:00 2001
From: David Kornel <kornys@outlook.com>
Date: Tue, 22 Aug 2023 14:20:11 +0200
Subject: [PATCH] Update thod pipeline to remove unnecesarry task

---
 .../test-suite/thor-test-suite.yaml.j2        | 135 ++++++++----------
 1 file changed, 62 insertions(+), 73 deletions(-)

diff --git a/install/roles/tealc/templates/tekton/pipelines/test-suite/thor-test-suite.yaml.j2 b/install/roles/tealc/templates/tekton/pipelines/test-suite/thor-test-suite.yaml.j2
index 9b7077b5..59610627 100644
--- a/install/roles/tealc/templates/tekton/pipelines/test-suite/thor-test-suite.yaml.j2
+++ b/install/roles/tealc/templates/tekton/pipelines/test-suite/thor-test-suite.yaml.j2
@@ -1,74 +1,4 @@
 apiVersion: tekton.dev/v1beta1
-kind: Task
-metadata:
-  name: thor-test-suite-task
-  labels:
-    project: tealc
-  annotations:
-    argocd.argoproj.io/hook: PreSync
-spec:
-  workspaces:
-    - name: task-ws
-  steps:
-    - name: execute-tests
-      image: quay.io/mk-ci-cd/mas-ci-tools:latest
-      env:
-        - name: WORKER_01_USERNAME
-          valueFrom:
-            secretKeyRef:
-              name: worker-01-tekton
-              key: username
-        - name: WORKER_01_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: worker-01-tekton
-              key: password
-        - name: WORKER_01_URL
-          valueFrom:
-            secretKeyRef:
-              name: worker-01-tekton
-              key: server
-        - name: WORKER_02_USERNAME
-          valueFrom:
-            secretKeyRef:
-              name: worker-02-tekton
-              key: username
-        - name: WORKER_02_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: worker-02-tekton
-              key: password
-        - name: WORKER_02_URL
-          valueFrom:
-            secretKeyRef:
-              name: worker-02-tekton
-              key: server
-        - name: WORKER_03_USERNAME
-          valueFrom:
-            secretKeyRef:
-              name: worker-03-tekton
-              key: username
-        - name: WORKER_03_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: worker-03-tekton
-              key: password
-        - name: WORKER_03_URL
-          valueFrom:
-            secretKeyRef:
-              name: worker-03-tekton
-              key: server
-      script: |
-        mkdir -p /opt/thor
-        cd /opt/thor
-
-        git clone https://github.com/ExcelentProject/thor.git
-        
-        cd thor
-        export JAVA_HOME=/usr/lib/jvm/java-17-openjdk
-        mvn test --no-transfer-progress
----
-apiVersion: tekton.dev/v1beta1
 kind: Pipeline
 metadata:
   name: thor-test-suite-pipeline
@@ -81,11 +11,70 @@ spec:
     - name: pipeline-ws
   tasks:
     - name: thor
-      taskRef:
-        name: thor-test-suite-task
       workspaces:
-        - name: task-ws
+        - name: pipeline-ws
           workspace: pipeline-ws
+      taskSpec:
+        workspaces:
+          - name: pipeline-ws
+        steps:
+          - name: execute-tests
+            image: quay.io/mk-ci-cd/mas-ci-tools:latest
+            env:
+              - name: WORKER_01_USERNAME
+                valueFrom:
+                  secretKeyRef:
+                    name: worker-01-tekton
+                    key: username
+              - name: WORKER_01_PASSWORD
+                valueFrom:
+                  secretKeyRef:
+                    name: worker-01-tekton
+                    key: password
+              - name: WORKER_01_URL
+                valueFrom:
+                  secretKeyRef:
+                    name: worker-01-tekton
+                    key: server
+              - name: WORKER_02_USERNAME
+                valueFrom:
+                  secretKeyRef:
+                    name: worker-02-tekton
+                    key: username
+              - name: WORKER_02_PASSWORD
+                valueFrom:
+                  secretKeyRef:
+                    name: worker-02-tekton
+                    key: password
+              - name: WORKER_02_URL
+                valueFrom:
+                  secretKeyRef:
+                    name: worker-02-tekton
+                    key: server
+              - name: WORKER_03_USERNAME
+                valueFrom:
+                  secretKeyRef:
+                    name: worker-03-tekton
+                    key: username
+              - name: WORKER_03_PASSWORD
+                valueFrom:
+                  secretKeyRef:
+                    name: worker-03-tekton
+                    key: password
+              - name: WORKER_03_URL
+                valueFrom:
+                  secretKeyRef:
+                    name: worker-03-tekton
+                    key: server
+            script: |
+              mkdir -p /opt/thor
+              cd /opt/thor
+
+              git clone https://github.com/ExcelentProject/thor.git
+
+              cd thor
+              export JAVA_HOME=/usr/lib/jvm/java-17-openjdk
+              mvn test --no-transfer-progress
   finally:
     - name: notify-slack
       when: