Add copy task for LICENSE and shared folder to fix konflux

Signed-off-by: gabriel-farache <[email protected]>
rhdhorchestrator · Oct 22, 2024 · 76ef6b4 · 76ef6b4
1 parent 216c1eb
commit 76ef6b4
Show file tree

Hide file tree

Showing 6 changed files with 73 additions and 53 deletions.
diff --git a/.tekton/copy-task.yaml b/.tekton/copy-task.yaml
@@ -0,0 +1,23 @@
+---
+apiVersion: tekton.dev/v1
+kind: Task
+metadata:
+  name: copy
+  namespace: orchestrator-releng-tenant
+spec:
+  workspaces:
+    - name: workspace
+  params:
+    - name: workflowId
+      description: The workflow ID from the repository
+      type: string
+  steps:
+    - name: copy
+      image: registry.access.redhat.com/ubi9-minimal
+      workingDir: $(workspaces.workspace.path)
+      script: |
+        cp -R source/shared source/$(params.workflowId)/shared
+        cp source/LICENSE source/$(params.workflowId)/LICENSE
+        ls -al  source/$(params.workflowId)
+        
+---
diff --git a/.tekton/move2kube-serverless-workflow-pull-request.yaml b/.tekton/move2kube-serverless-workflow-pull-request.yaml
@@ -7,7 +7,7 @@ metadata:
     build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}'
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "main" && ( "move2kube/***".pathChanged() || ".tekton/move2kube-serverless-workflow-pull-request.yaml".pathChanged() || "pipeline/workflow-builder.Dockerfile".pathChanged() )
+    pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "main" && ( "move2kube/***".pathChanged() || ".tekton/move2kube-serverless-workflow-pull-request.yaml".pathChanged() || ".tekton/copy-task.yaml".pathChanged() || "pipeline/workflow-builder.Dockerfile".pathChanged() )
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: serverless-workflows
@@ -206,6 +206,17 @@ spec:
         workspace: workspace
       - name: git-basic-auth
         workspace: git-auth
+    - name: copy-shared-files-and-folders
+      runAfter:
+      - clone-repository
+      taskRef:
+        name: copy
+      params:
+      - name: workflowId
+        value: $(params.path-context)
+      workspaces:
+      - name: source
+        workspace: workspace
     - name: build-container
       params:
       - name: IMAGE
@@ -226,6 +237,7 @@ spec:
         value: $(params.build-args-file)
       runAfter:
       - prefetch-dependencies
+      - copy-shared-files-and-folders
       taskRef:
         params:
         - name: name

diff --git a/.tekton/move2kube-serverless-workflow-push.yaml b/.tekton/move2kube-serverless-workflow-push.yaml
@@ -203,6 +203,17 @@ spec:
         workspace: workspace
       - name: git-basic-auth
         workspace: git-auth
+    - name: copy-shared-files-and-folders
+      runAfter:
+      - clone-repository
+      taskRef:
+        name: copy
+      params:
+      - name: workflowId
+        value: $(params.path-context)
+      workspaces:
+      - name: source
+        workspace: workspace
     - name: build-container
       params:
       - name: IMAGE
@@ -223,6 +234,7 @@ spec:
         value: $(params.build-args-file)
       runAfter:
       - prefetch-dependencies
+      - copy-shared-files-and-folders
       taskRef:
         params:
         - name: name

diff --git a/.tekton/mta-serverless-workflow-pull-request.yaml b/.tekton/mta-serverless-workflow-pull-request.yaml
@@ -7,7 +7,7 @@ metadata:
     build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}'
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "main" && ( "mta-v7.x/***".pathChanged() || ".tekton/mta-serverless-workflow-pull-request.yaml".pathChanged() || "pipeline/workflow-builder.Dockerfile".pathChanged() )
+    pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "main" && ( "mta-v7.x/***".pathChanged() || ".tekton/mta-serverless-workflow-pull-request.yaml".pathChanged() || ".tekton/copy-task.yaml".pathChanged() || "pipeline/workflow-builder.Dockerfile".pathChanged() )
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: serverless-workflows
@@ -206,6 +206,17 @@ spec:
         workspace: workspace
       - name: git-basic-auth
         workspace: git-auth
+    - name: copy-shared-files-and-folders
+      runAfter:
+      - clone-repository
+      taskRef:
+        name: copy
+      params:
+      - name: workflowId
+        value: $(params.path-context)
+      workspaces:
+      - name: source
+        workspace: workspace
     - name: build-container
       params:
       - name: IMAGE
@@ -226,6 +237,7 @@ spec:
         value: $(params.build-args-file)
       runAfter:
       - prefetch-dependencies
+      - copy-shared-files-and-folders
       taskRef:
         params:
         - name: name

diff --git a/.tekton/mta-serverless-workflow-push.yaml b/.tekton/mta-serverless-workflow-push.yaml
@@ -203,6 +203,17 @@ spec:
         workspace: workspace
       - name: git-basic-auth
         workspace: git-auth
+    - name: copy-shared-files-and-folders
+      runAfter:
+      - clone-repository
+      taskRef:
+        name: copy
+      params:
+      - name: workflowId
+        value: $(params.path-context)
+      workspaces:
+      - name: source
+        workspace: workspace
     - name: build-container
       params:
       - name: IMAGE
@@ -223,6 +234,7 @@ spec:
         value: $(params.build-args-file)
       runAfter:
       - prefetch-dependencies
+      - copy-shared-files-and-folders
       taskRef:
         params:
         - name: name

diff --git a/e2e/mta.sh b/e2e/mta.sh