Skip to content
Open
Changes from 1 commit
Commits
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
1 change: 1 addition & 0 deletions docs/release-workflow-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ gitGraph
The PR author should then create another PR targeting the `rhoai` branch. CI automation typically creates the cherry-pick PR. Add a `/cherry-pick rhoai` comment to the original PR; CI will report success or failure. If it fails, manually cherry-pick the commits into a new branch and open a new PR.
3. **Edit the cherry-pick PR:** Edit the title to include the prefix `[sync]`. If the PR is associated with any Jira
ticket, edit the description to include the ticket link.
3. **Renegerate the bundle:** As of [#2329](https://github.com/opendatahub-io/opendatahub-operator/pull/2329), the `main` branch doesn't maintain most generated files anymore; however downstream builds still need bundle contents in the `rhoai` branch, so it is necessary to regenerate the bundle in the sync PR.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we also mention, if PR touches API config etc should not use "cherrypick" bot instead of create manual PR?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should still be fine in that case, as the API change will cherry-pick cleanly.

It simply won't pass CI checks, specifically, the one in .github/workflows/test-required-files-updated.yaml, so it will require an extra step.

FYI I also have red-hat-data-services#13421 open to remove the need to maintain bundle in the repo in rhoai branch.

4. **Merge sync PR:**
After the sync PR has passed GitHub checks and is reviewed and approved, CI will merge it into the `rhoai` branch.

Expand Down