Skip to content

Merge https://github.com/kubernetes-sigs/cluster-api-provider-openstack:release-0.11 into main#332

Merged
openshift-merge-bot[bot] merged 5 commits intoopenshift:mainfrom
shiftstack:merge-bot-main
Nov 11, 2024
Merged

Merge https://github.com/kubernetes-sigs/cluster-api-provider-openstack:release-0.11 into main#332
openshift-merge-bot[bot] merged 5 commits intoopenshift:mainfrom
shiftstack:merge-bot-main

Conversation

@shiftstack-merge-bot
Copy link
Copy Markdown

No description provided.

@openshift-ci openshift-ci Bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Nov 11, 2024
@openshift-ci openshift-ci Bot requested review from MaysaMacedo and gryf November 11, 2024 12:08
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Nov 11, 2024

Hi @shiftstack-merge-bot[bot]. Thanks for your PR.

I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

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.

@EmilienM
Copy link
Copy Markdown
Member

/ok-to-test

@openshift-ci openshift-ci Bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Nov 11, 2024
@EmilienM EmilienM force-pushed the merge-bot-main branch 4 times, most recently from fb45bf0 to 624a3d5 Compare November 11, 2024 16:42
EmilienM added a commit to shiftstack/merge-bot that referenced this pull request Nov 11, 2024
Some projects need to run custom tasks when merging with upstream, like
vendoring or code generation. Let's try to run `make merge-bot` and if
the target doesn't exist we simply don't return an error.

Example on where it'll be used: openshift/cluster-api-provider-openstack#332
EmilienM added a commit to shiftstack/merge-bot that referenced this pull request Nov 11, 2024
Some projects need to run custom tasks when merging with upstream, like
vendoring or code generation. Let's try to run `make merge-bot` and if
the target doesn't exist we simply don't return an error.

Example on where it'll be used: openshift/cluster-api-provider-openstack#332
@EmilienM
Copy link
Copy Markdown
Member

/approve
/lgtm
/hold for CI

@openshift-ci openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 11, 2024
@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Nov 11, 2024
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Nov 11, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: EmilienM

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

The pull request process is described here

Details 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

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 11, 2024
@EmilienM
Copy link
Copy Markdown
Member

/hold cancel

@openshift-ci openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 11, 2024
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Nov 11, 2024

@shiftstack-merge-bot[bot]: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/security 56e2987 link false /test security

Full PR test history. Your PR dashboard.

Details

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-merge-bot openshift-merge-bot Bot merged commit 9a7cd01 into openshift:main Nov 11, 2024
@openshift-merge-bot openshift-merge-bot Bot deleted the merge-bot-main branch November 11, 2024 19:31
@openshift-bot
Copy link
Copy Markdown

[ART PR BUILD NOTIFIER]

Distgit: openstack-cluster-api-controllers
This PR has been included in build openstack-cluster-api-controllers-container-v4.18.0-202411112207.p0.g9a7cd01.assembly.stream.el9.
All builds following this will include this PR.

EmilienM added a commit to shiftstack/merge-bot that referenced this pull request Nov 12, 2024
Some projects need to run custom tasks when merging with upstream, like
vendoring or code generation. Let's try to run `make merge-bot` and if
the target doesn't exist we simply don't return an error.

Example on where it'll be used: openshift/cluster-api-provider-openstack#332
EmilienM added a commit to shiftstack/merge-bot that referenced this pull request Nov 12, 2024
Some projects need to run custom tasks when merging with upstream, like
vendoring or code generation. Let's try to run `make merge-bot` and if
the target doesn't exist we simply don't return an error.

Example on where it'll be used: openshift/cluster-api-provider-openstack#332
EmilienM added a commit to shiftstack/merge-bot that referenced this pull request Nov 14, 2024
Some projects need to run custom tasks when merging with upstream, like
vendoring or code generation. Let's try to run `make merge-bot` and if
the target doesn't exist we simply don't return an error.

Example on where it'll be used: openshift/cluster-api-provider-openstack#332
EmilienM added a commit to shiftstack/merge-bot that referenced this pull request Nov 22, 2024
Some projects need to run custom tasks when merging with upstream, like
vendoring or code generation. Let's try to run `make merge-bot`
If the target doesn't exist we return an error.

Example on where it'll be used: openshift/cluster-api-provider-openstack#332

This feature can be used through a new CLI option: `--run-make`.
EmilienM added a commit to shiftstack/merge-bot that referenced this pull request Nov 22, 2024
Some projects need to run custom tasks when merging with upstream, like
vendoring or code generation. Let's try to run `make merge-bot`
If the target doesn't exist we return an error.

Example on where it'll be used: openshift/cluster-api-provider-openstack#332

This feature can be used through a new CLI option: `--run-make`.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants