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

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

Add targetBranch merging #2920

wants to merge 1 commit into from

Conversation

wgahnagl
Copy link
Contributor

@wgahnagl wgahnagl commented May 13, 2025 •
edited by mtnbikenc
Loading

based on this example pull request from konflux-ci/build-definitions#2178

Reopened from #2808

This PR is implementing the feature developed here: https://issues.redhat.com/browse/KONFLUX-8246

@openshift-ci openshift-ci bot requested review from mansikulkarni96 and sebsoto May 13, 2025 13:29
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 24, 2025
@wgahnagl wgahnagl force-pushed the konflux-TargetBranch branch from 786e651 to a12b5c1 Compare June 5, 2025 18:01
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 5, 2025
@mtnbikenc
Copy link
Member

/retest

@red-hat-konflux Red Hat Konflux
Copy link
Contributor

Caution

There are some errors in your PipelineRun template.

PipelineRun Error
wmco-idms no kind "ImageDigestMirrorSet" is registered for version "config.openshift.io/v1" in scheme "k8s.io/client-go/kubernetes/scheme/register.go:83"

@mtnbikenc
Copy link
Member

/retest

2 similar comments
@mtnbikenc
Copy link
Member

/retest

@mtnbikenc
Copy link
Member

/retest

@mtnbikenc
Copy link
Member

This PR is implementing the feature developed here: https://issues.redhat.com/browse/KONFLUX-8246

@wgahnagl
Copy link
Contributor Author

wgahnagl commented Jul 3, 2025

/retest

2 similar comments
@wgahnagl
Copy link
Contributor Author

wgahnagl commented Jul 3, 2025

/retest

@wgahnagl
Copy link
Contributor Author

wgahnagl commented Jul 7, 2025

/retest

@wgahnagl wgahnagl force-pushed the konflux-TargetBranch branch from a2df560 to 10a0b64 Compare July 7, 2025 14:35
@wgahnagl wgahnagl closed this Jul 9, 2025
@wgahnagl wgahnagl force-pushed the konflux-TargetBranch branch from 10a0b64 to ca13be9 Compare July 9, 2025 18:37
@wgahnagl wgahnagl reopened this Jul 9, 2025
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 9, 2025
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jul 9, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: wgahnagl
Once this PR has been reviewed and has the lgtm label, please assign mansikulkarni96 for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

1 similar comment
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jul 9, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: wgahnagl
Once this PR has been reviewed and has the lgtm label, please assign mansikulkarni96 for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@wgahnagl wgahnagl force-pushed the konflux-TargetBranch branch from 37d2347 to 2846cec Compare July 9, 2025 19:30
@wgahnagl
Copy link
Contributor Author

wgahnagl commented Jul 9, 2025

/retest

@wgahnagl wgahnagl force-pushed the konflux-TargetBranch branch from 2846cec to ec8b39f Compare July 9, 2025 19:51
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 9, 2025
@wgahnagl wgahnagl force-pushed the konflux-TargetBranch branch from 56b62bf to e3dd69a Compare July 9, 2025 20:42
@wgahnagl wgahnagl force-pushed the konflux-TargetBranch branch from e3dd69a to 1872df0 Compare July 10, 2025 13:16
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jul 10, 2025

@wgahnagl: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@openshift-bot
Copy link

Issues go stale after 90d of inactivity.

Mark the issue as fresh by commenting /remove-lifecycle stale.
Stale issues rot after an additional 30d of inactivity and eventually close.
Exclude this issue from closing by commenting /lifecycle frozen.

If this issue is safe to close now please do so with /close.

/lifecycle stale

@openshift-ci openshift-ci bot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Oct 9, 2025
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 9, 2025
@openshift-merge-robot
Copy link
Contributor

PR needs rebase.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mansikulkarni96 mansikulkarni96 Awaiting requested review from mansikulkarni96

@sebsoto sebsoto Awaiting requested review from sebsoto

Assignees

No one assigned

Labels

lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@wgahnagl @mtnbikenc @openshift-bot @openshift-merge-robot