Skip to content

Commit a12b5c1

Browse files
committed
Add targetBranch merging
1 parent 04a6681 commit a12b5c1

4 files changed

+36
-4
lines changed

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,11 @@ spec:
2929
- name: dockerfile
3030
value: Containerfile.bundle
3131
- name: git-url
32-
value: '{{source_url}}'
32+
value: '{{repo_url}}'
33+
- name: mergeTargetBranch
34+
value: "true"
35+
- name: targetBranch
36+
value: "{{target_branch}}"
3337
- name: image-expires-after
3438
value: 5d
3539
- name: output-image
@@ -138,6 +142,10 @@ spec:
138142
resolver: bundles
139143
- name: clone-repository
140144
params:
145+
- name: mergeTargetBranch
146+
value: $(params.mergeTargetBranch)
147+
- name: targetBranch
148+
value: $(params.targetBranch)
141149
- name: url
142150
value: $(params.git-url)
143151
- name: revision

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@ spec:
2828
- name: dockerfile
2929
value: Containerfile.bundle
3030
- name: git-url
31-
value: '{{source_url}}'
31+
value: '{{repo_url}}'
32+
- name: mergeTargetBranch
33+
value: "true"
34+
- name: targetBranch
35+
value: "{{target_branch}}"
3236
- name: output-image
3337
value: quay.io/redhat-user-workloads/windows-machine-conf-tenant/windows-machine-config-operator/windows-machine-config-operator-bundle-release-4-20:{{revision}}
3438
- name: revision
@@ -135,6 +139,10 @@ spec:
135139
resolver: bundles
136140
- name: clone-repository
137141
params:
142+
- name: mergeTargetBranch
143+
value: $(params.mergeTargetBranch)
144+
- name: targetBranch
145+
value: $(params.targetBranch)
138146
- name: url
139147
value: $(params.git-url)
140148
- name: revision

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,11 @@ spec:
2929
- name: dockerfile
3030
value: Containerfile
3131
- name: git-url
32-
value: '{{source_url}}'
32+
value: '{{repo_url}}'
33+
- name: mergeTargetBranch
34+
value: "true"
35+
- name: targetBranch
36+
value: "{{target_branch}}"
3337
- name: image-expires-after
3438
value: 5d
3539
- name: output-image
@@ -138,6 +142,10 @@ spec:
138142
resolver: bundles
139143
- name: clone-repository
140144
params:
145+
- name: mergeTargetBranch
146+
value: $(params.mergeTargetBranch)
147+
- name: targetBranch
148+
value: $(params.targetBranch)
141149
- name: url
142150
value: $(params.git-url)
143151
- name: revision

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@ spec:
2828
- name: dockerfile
2929
value: Containerfile
3030
- name: git-url
31-
value: '{{source_url}}'
31+
value: '{{repo_url}}'
32+
- name: mergeTargetBranch
33+
value: "true"
34+
- name: targetBranch
35+
value: "{{target_branch}}"
3236
- name: output-image
3337
value: quay.io/redhat-user-workloads/windows-machine-conf-tenant/windows-machine-config-operator/windows-machine-config-operator-release-4-20:{{revision}}
3438
- name: revision
@@ -135,6 +139,10 @@ spec:
135139
resolver: bundles
136140
- name: clone-repository
137141
params:
142+
- name: mergeTargetBranch
143+
value: $(params.mergeTargetBranch)
144+
- name: targetBranch
145+
value: $(params.targetBranch)
138146
- name: url
139147
value: $(params.git-url)
140148
- name: revision

0 commit comments

Comments
 (0)