Skip to content

Add targetBranch merging #2920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add targetBranch merging #2920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion .tekton/windows-machine-config-operator-bundle-release-4-20-pull-request.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -142,6 +151,8 @@ spec:
value: $(params.output-image).git
- name: ociArtifactExpiresAfter
value: $(params.image-expires-after)
- name: depth
value: "0"
runAfter:
- init
taskRef:
Expand Down
12 changes: 11 additions & 1 deletion .tekton/windows-machine-config-operator-bundle-release-4-20-push.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -139,6 +147,8 @@ spec:
value: $(params.output-image).git
- name: ociArtifactExpiresAfter
value: $(params.image-expires-after)
- name: depth
value: "0"
runAfter:
- init
taskRef:
Expand Down
12 changes: 11 additions & 1 deletion .tekton/windows-machine-config-operator-release-4-20-pull-request.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -142,6 +150,8 @@ spec:
value: $(params.output-image).git
- name: ociArtifactExpiresAfter
value: $(params.image-expires-after)
- name: depth
value: "0"
runAfter:
- init
taskRef:
Expand Down
12 changes: 11 additions & 1 deletion .tekton/windows-machine-config-operator-release-4-20-push.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -139,6 +147,8 @@ spec:
value: $(params.output-image).git
- name: ociArtifactExpiresAfter
value: $(params.image-expires-after)
- name: depth
value: "0"
runAfter:
- init
taskRef:
Expand Down
2 changes: 1 addition & 1 deletion Containerfile.bundle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:3529d7ee33bb186bf753ab0f528ec677a7d96c7eaae28cce8891ec29180bdd96|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
Expand Down