OCPCLOUD-2824: rebasebot: setup periodic jobs for rebasing cluster-api providers #57749
Conversation
openshift-ci
bot
added
the
approved
openshift-ci-robot
added
the
rehearsals-ack
RadekManak
force-pushed
the
capz-rebases
branch
from
48ed77b to
5f9d8fb
Compare
openshift-ci-robot
removed
the
rehearsals-ack
|
/pj-rehearse |
|
@RadekManak: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
RadekManak
force-pushed
the
capz-rebases
branch
from
5f9d8fb to
6697754
Compare
|
/pj-rehearse |
|
@RadekManak: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
RadekManak
force-pushed
the
capz-rebases
branch
from
6697754 to
a2bb54a
Compare
|
/pj-rehearse |
|
@RadekManak: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
RadekManak
force-pushed
the
capz-rebases
branch
from
a2bb54a to
fe851f5
Compare
|
/pj-rehearse |
|
@RadekManak: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
RadekManak
force-pushed
the
capz-rebases
branch
from
fe851f5 to
f7d0523
Compare
|
/pj-rehearse periodic-ci-openshift-eng-rebasebot-main-cluster-api-provider-azure |
|
@RadekManak: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
|
/pj-rehearse periodic-ci-openshift-eng-rebasebot-main-cluster-api-provider-azure |
|
@RadekManak: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
There was a problem hiding this comment.
Thanks for putting this together @RadekManak 👍
Looks reasonable to me. I left a couple of comments to not forget about the things we discussed.
Also we should try and fix: openshift-eng/rebasebot#56
to avoid confusion.
ci-operator/config/openshift-eng/rebasebot/openshift-eng-rebasebot-main.yaml
Outdated
Show resolved
Hide resolved
ci-operator/config/openshift-eng/rebasebot/openshift-eng-rebasebot-main.yaml
Outdated
Show resolved
Hide resolved
|
/assign @JoelSpeed |
|
/lgtm @RadekManak you'll need to As Dam mentions would be good to dedupe some of the scripting needed here at some point, but lets not block on that |
|
Even though the E2Es on the rebase PR are failing (likely an ASO issue). The rebase was performed correctly. So I'm happy for @RadekManak to ack the rehearsals. |
|
/pj-rehearse ack |
|
@RadekManak: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
|
/pj-rehearse periodic-ci-openshift-eng-rebasebot-main-cluster-api-provider-aws |
|
@damdo: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
|
Is this ready to be merged? |
| UPSTREAM_VERSION=$(curl --silent --header "X-GitHub-Api-Version:2022-11-28" "https://api.github.com/repos/kubernetes-sigs/cluster-api-provider-vsphere/releases" | grep '"tag_name":' | grep -v alpha | grep -v beta | grep -v rc | sed -E 's/.*"([^"]+)".*/\1/' | sed '/-/!{s/$/_/}' | sort -V | sed 's/_$//' | tail -n1) | ||
| rebasebot --source kubernetes-sigs/cluster-api-provider-vsphere:"${UPSTREAM_VERSION}" \ | ||
| --dest openshift/cluster-api-provider-vsphere:master \ | ||
| --rebase openshift-cloud-team/cluster-api-provider-vsphere:rebase-bot-master \ |
There was a problem hiding this comment.
I think we could change the rebase-bot-master branch name here to something different, which encompasses the version computed. So we can have multiple PRs based on different versions, e.g. for syncing older release branches with newer upstream releases.
There was a problem hiding this comment.
I am thinking we extend this to be rebase-bot-<target_branch>. We could make this the default when the rebase branch is not specified. For now, I have updated to rebase-bot-main where the dest branch is main.
|
/pj-rehearse periodic-ci-openshift-eng-rebasebot-main-cluster-api-provider-aws |
|
@damdo: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
RadekManak
force-pushed
the
capz-rebases
branch
from
b0f7d24 to
0f60693
Compare
| UPSTREAM_VERSION=$(curl --silent --header "X-GitHub-Api-Version:2022-11-28" "https://api.github.com/repos/kubernetes-sigs/cluster-api-provider-vsphere/releases" | grep '"tag_name":' | grep -v alpha | grep -v beta | grep -v rc | sed -E 's/.*"([^"]+)".*/\1/' | sed '/-/!{s/$/_/}' | sort -V | sed 's/_$//' | tail -n1) | ||
| rebasebot --source kubernetes-sigs/cluster-api-provider-vsphere:"${UPSTREAM_VERSION}" \ | ||
| --dest openshift/cluster-api-provider-vsphere:master \ | ||
| --rebase openshift-cloud-team/cluster-api-provider-vsphere:rebase-bot-master \ |
There was a problem hiding this comment.
I am thinking we extend this to be rebase-bot-<target_branch>. We could make this the default when the rebase branch is not specified. For now, I have updated to rebase-bot-main where the dest branch is main.
|
[REHEARSALNOTIFIER]
Interacting with pj-rehearseComment: Once you are satisfied with the results of the rehearsals, comment: |
|
/pj-rehearse periodic-ci-openshift-eng-rebasebot-main-cloud-provider-aws |
|
@RadekManak: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
|
/pj-rehearse periodic-ci-openshift-eng-rebasebot-main-cluster-api-provider-aws |
|
@RadekManak: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
|
@RadekManak Are we able to merge this soon? |
|
/pj-rehearse periodic-ci-openshift-eng-rebasebot-main-cluster-api-provider-aws |
|
@RadekManak: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
|
/pj-rehearse ack |
|
@RadekManak: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
openshift-ci-robot
added
the
rehearsals-ack
|
@JoelSpeed I think we can merge now. |
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: JoelSpeed, RadekManak The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
@RadekManak: 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. |
…i providers (openshift#57749) * Setup rebasebot to rebase cluster api repositories * Change rebasebot rebase branch name to align with dest branch
…i providers (openshift#57749) * Setup rebasebot to rebase cluster api repositories * Change rebasebot rebase branch name to align with dest branch
…i providers (openshift#57749) * Setup rebasebot to rebase cluster api repositories * Change rebasebot rebase branch name to align with dest branch
This PR enables rebasebot for cluster-api-provider-azure.
It fetches the latest release from API, extracts the release tag from it and set it as rebase source.
CAPI providers require generating customized manifests for openshift. This is achieved by using provided lifecyclehook scripts that executes the generation make target and commits changes.
I am considering moving the generation script into the azure repository, but have it here for easier testing.