From bf6e4ac81ab07198f15b0afb01f19e13539d09d2 Mon Sep 17 00:00:00 2001
From: Dheeraj Singh Jodha <dheerajsinghjodha@yahoo.com.au>
Date: Wed, 2 Aug 2023 23:41:01 +0530
Subject: [PATCH] chore(ci): add workaround for new OSP ver

* Currently, the bundles in the ./tekton/*.yml files are
  causing failure due to some recent changes in PLR
  definition.
* To solve, this we moved the bundle inside the resolver,
  and explicitly set the "kind: Pipeline" as it took the
  value "kind: Task" by default and caused CI failure.

Signed-off-by: Dheeraj <djodha@redhat.com>
---
 .tekton/pull-request.yaml | 11 +++++++++--
 .tekton/push.yaml         | 11 +++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/.tekton/pull-request.yaml b/.tekton/pull-request.yaml
index b70aff8bf..455f96a9b 100644
--- a/.tekton/pull-request.yaml
+++ b/.tekton/pull-request.yaml
@@ -16,8 +16,15 @@ spec:
     - name: output-image
       value: 'quay.io/redhat-appstudio/pull-request-builds:integration-service-{{ revision }}'
   pipelineRef:
-    name: docker-build
-    bundle: quay.io/redhat-appstudio-tekton-catalog/pipeline-core-services-docker-build:latest
+    params:
+      - name: bundle
+        value: >-
+          quay.io/redhat-appstudio-tekton-catalog/pipeline-core-services-docker-build:latest
+      - name: name
+        value: docker-build
+      - name: kind
+        value: Pipeline
+    resolver: bundles
   workspaces:
     - name: workspace
       volumeClaimTemplate:
diff --git a/.tekton/push.yaml b/.tekton/push.yaml
index 6a739ee3e..7fbef46b4 100644
--- a/.tekton/push.yaml
+++ b/.tekton/push.yaml
@@ -20,8 +20,15 @@ spec:
         sed -i -e 's|\(https://github.com/redhat-appstudio/integration-service/.*?ref=\)\(.*\)|\1{{ revision }}|' -e 's/\(newTag: \).*/\1{{ revision }}/' components/integration/kustomization.yaml
         sed -i -e 's|\(https://github.com/redhat-appstudio/integration-service/.*?ref=\)\(.*\)|\1{{ revision }}|' -e 's/\(newTag: \).*/\1{{ revision }}/' components/monitoring/grafana/base/dashboards/integration/kustomization.yaml
   pipelineRef:
-    name: docker-build
-    bundle: quay.io/redhat-appstudio-tekton-catalog/pipeline-core-services-docker-build:latest
+    params:
+      - name: bundle
+        value: >-
+          quay.io/redhat-appstudio-tekton-catalog/pipeline-core-services-docker-build:latest
+      - name: name
+        value: docker-build
+      - name: kind
+        value: Pipeline
+    resolver: bundles
   workspaces:
     - name: workspace
       volumeClaimTemplate: