Add targetBranch merging

Author: wgahnagl

.tekton/windows-machine-config-operator-bundle-master-pull-request.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: image-expires-after
     value: 5d
   - name: output-image
@@ -172,6 +176,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

.tekton/windows-machine-config-operator-bundle-master-push.yaml

@@ -27,7 +27,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-master:{{revision}}
   - name: revision
@@ -169,6 +173,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

.tekton/windows-machine-config-operator-master-pull-request.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: image-expires-after
     value: 5d
   - name: output-image
@@ -172,6 +176,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

.tekton/windows-machine-config-operator-master-push.yaml

@@ -27,7 +27,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-master:{{revision}}
   - name: revision
@@ -169,6 +173,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