Skip to content

Commit 10a0b64

Browse files
committed
Add targetBranch merging
1 parent ca96ee0 commit 10a0b64

4 files changed

+45
-4
lines changed

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

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,12 @@ 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}}"
37+
3338
- name: image-expires-after
3439
value: 5d
3540
- name: output-image
@@ -134,6 +139,10 @@ spec:
134139
resolver: bundles
135140
- name: clone-repository
136141
params:
142+
- name: mergeTargetBranch
143+
value: $(params.mergeTargetBranch)
144+
- name: targetBranch
145+
value: $(params.targetBranch)
137146
- name: url
138147
value: $(params.git-url)
139148
- name: revision
@@ -142,6 +151,8 @@ spec:
142151
value: $(params.output-image).git
143152
- name: ociArtifactExpiresAfter
144153
value: $(params.image-expires-after)
154+
- name: depth
155+
value: "0"
145156
runAfter:
146157
- init
147158
taskRef:

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

Lines changed: 11 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
@@ -131,6 +135,10 @@ spec:
131135
resolver: bundles
132136
- name: clone-repository
133137
params:
138+
- name: mergeTargetBranch
139+
value: $(params.mergeTargetBranch)
140+
- name: targetBranch
141+
value: $(params.targetBranch)
134142
- name: url
135143
value: $(params.git-url)
136144
- name: revision
@@ -139,6 +147,8 @@ spec:
139147
value: $(params.output-image).git
140148
- name: ociArtifactExpiresAfter
141149
value: $(params.image-expires-after)
150+
- name: depth
151+
value: "0"
142152
runAfter:
143153
- init
144154
taskRef:

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

Lines changed: 11 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
@@ -134,6 +138,10 @@ spec:
134138
resolver: bundles
135139
- name: clone-repository
136140
params:
141+
- name: mergeTargetBranch
142+
value: $(params.mergeTargetBranch)
143+
- name: targetBranch
144+
value: $(params.targetBranch)
137145
- name: url
138146
value: $(params.git-url)
139147
- name: revision
@@ -142,6 +150,8 @@ spec:
142150
value: $(params.output-image).git
143151
- name: ociArtifactExpiresAfter
144152
value: $(params.image-expires-after)
153+
- name: depth
154+
value: "0"
145155
runAfter:
146156
- init
147157
taskRef:

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

Lines changed: 11 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
@@ -131,6 +135,10 @@ spec:
131135
resolver: bundles
132136
- name: clone-repository
133137
params:
138+
- name: mergeTargetBranch
139+
value: $(params.mergeTargetBranch)
140+
- name: targetBranch
141+
value: $(params.targetBranch)
134142
- name: url
135143
value: $(params.git-url)
136144
- name: revision
@@ -139,6 +147,8 @@ spec:
139147
value: $(params.output-image).git
140148
- name: ociArtifactExpiresAfter
141149
value: $(params.image-expires-after)
150+
- name: depth
151+
value: "0"
142152
runAfter:
143153
- init
144154
taskRef:

0 commit comments

Comments
 (0)