-
Bug
-
Resolution: Done
-
Normal
-
None
-
None
-
1
-
False
-
-
False
-
-
-
RHDH Core Team 3264
Description of problem:
To avoid test failures due to outdated PR branches, it's important to automatically merge the 'main' branch into any PR branch before building an image. This ensures that all PRs are tested against the latest codebase, avoiding scenarios where PRs might pass based on outdated checks or fail because they don't include recent changes made in the 'main' branch.
Slack conversation :
https://redhat-internal.slack.com/archives/C04CUSD4JSG/p1715606668170409
Prerequisites (if any, like setup, operators/versions):
Steps to Reproduce
- Create a pull request that doesn't have latest changes from main.
- Wait for Image build job and deploy that image.
- check/verify if it have latest changes from main as well.
Actual results:
PR builds doesn't not have latest updates from main.
Expected results:
Automate Merging of 'Main' Branch into PR Branches Before Image Builds
Reproducibility (Always/Intermittent/Only Once): Always
Build Details:
Additional info (Such as Logs, Screenshots, etc):
**
Logs of PR check e2e-test failed due to this: log link
Logs of PR check that passed after rebase : log link