fix

Author: wgahnagl

.tekton/windows-machine-config-operator-bundle-release-4-20-pull-request.yaml

@@ -29,7 +29,12 @@ spec:
   - name: dockerfile
     value: Containerfile.bundle
   - name: git-url
-    value: '{{source_url}}'
+    value: '{{repo_url}}'
+  - name: mergeTargetBranch
+    value: "true" 
+  - name: targetBranch
+    value: "{{target_branch}}"
+
   - name: image-expires-after
     value: 5d
   - name: output-image
@@ -134,6 +139,10 @@ spec:
         resolver: bundles
     - name: clone-repository
       params:
+      - name: mergeTargetBranch
+        value: $(params.mergeTargetBranch)
+      - name: targetBranch
+        value: $(params.targetBranch)
       - name: url
         value: $(params.git-url)
       - name: revision
@@ -142,6 +151,8 @@ spec:
         value: $(params.output-image).git
       - name: ociArtifactExpiresAfter
         value: $(params.image-expires-after)
+      - name: depth
+        value: "0" 
       runAfter:
       - init
       taskRef:

.tekton/windows-machine-config-operator-bundle-release-4-20-push.yaml

@@ -28,7 +28,11 @@ spec:
   - name: dockerfile
     value: Containerfile.bundle
   - name: git-url
-    value: '{{source_url}}'
+    value: '{{repo_url}}'
+  - name: mergeTargetBranch
+    value: "true" 
+  - name: targetBranch
+    value: "{{target_branch}}"
   - name: output-image
     value: quay.io/redhat-user-workloads/windows-machine-conf-tenant/windows-machine-config-operator/windows-machine-config-operator-bundle-release-4-20:{{revision}}
   - name: revision
@@ -131,6 +135,10 @@ spec:
         resolver: bundles
     - name: clone-repository
       params:
+      - name: mergeTargetBranch
+        value: $(params.mergeTargetBranch)
+      - name: targetBranch
+        value: $(params.targetBranch)
       - name: url
         value: $(params.git-url)
       - name: revision
@@ -139,6 +147,8 @@ spec:
         value: $(params.output-image).git
       - name: ociArtifactExpiresAfter
         value: $(params.image-expires-after)
+      - name: depth
+        value: "0"
       runAfter:
       - init
       taskRef:

.tekton/windows-machine-config-operator-release-4-20-pull-request.yaml

@@ -29,7 +29,11 @@ spec:
   - name: dockerfile
     value: Containerfile
   - name: git-url
-    value: '{{source_url}}'
+    value: '{{repo_url}}'
+  - name: mergeTargetBranch
+    value: "true" 
+  - name: targetBranch
+    value: "{{target_branch}}"
   - name: image-expires-after
     value: 5d
   - name: output-image
@@ -134,6 +138,10 @@ spec:
         resolver: bundles
     - name: clone-repository
       params:
+      - name: mergeTargetBranch
+        value: $(params.mergeTargetBranch)
+      - name: targetBranch
+        value: $(params.targetBranch)
       - name: url
         value: $(params.git-url)
       - name: revision
@@ -142,6 +150,8 @@ spec:
         value: $(params.output-image).git
       - name: ociArtifactExpiresAfter
         value: $(params.image-expires-after)
+      - name: depth
+        value: "0"
       runAfter:
       - init
       taskRef:

.tekton/windows-machine-config-operator-release-4-20-push.yaml

@@ -28,7 +28,11 @@ spec:
   - name: dockerfile
     value: Containerfile
   - name: git-url
-    value: '{{source_url}}'
+    value: '{{repo_url}}'
+  - name: mergeTargetBranch
+    value: "true" 
+  - name: targetBranch
+    value: "{{target_branch}}"
   - name: output-image
     value: quay.io/redhat-user-workloads/windows-machine-conf-tenant/windows-machine-config-operator/windows-machine-config-operator-release-4-20:{{revision}}
   - name: revision
@@ -131,6 +135,10 @@ spec:
         resolver: bundles
     - name: clone-repository
       params:
+      - name: mergeTargetBranch
+        value: $(params.mergeTargetBranch)
+      - name: targetBranch
+        value: $(params.targetBranch)
       - name: url
         value: $(params.git-url)
       - name: revision
@@ -139,6 +147,8 @@ spec:
         value: $(params.output-image).git
       - name: ociArtifactExpiresAfter
         value: $(params.image-expires-after)
+      - name: depth
+        value: "0"
       runAfter:
       - init
       taskRef:

Containerfile.bundle

@@ -1,6 +1,6 @@
 FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.23 as image-replacer
 COPY bundle/manifests /manifests
-RUN sed -i "s|REPLACE_IMAGE|registry.redhat.io/openshift4-wincw/windows-machine-config-rhel9-operator@sha256:b63bf14c57594d6a765d5b40b5d48d260c0a46a97afb742abf6b6e670b56bf95|g" /manifests/windows-machine-config-operator.clusterserviceversion.yaml
+RUN sed -i "s|REPLACE_IMAGE|registry.redhat.io/openshift4-wincw/windows-machine-config-rhel9-operator@sha256:4e8c0c3e7cccc415f9483c1f7a3c1eea467eb1d9746aeb2711ecd77c28426704|g" /manifests/windows-machine-config-operator.clusterserviceversion.yaml
 RUN sed -i "s|REPLACE_DATE|$(date "+%Y-%m-%dT%H:%M:%SZ")|g" /manifests/windows-machine-config-operator.clusterserviceversion.yaml
 
 FROM scratch