New "Weather Item" process with full preparation on topic and verification instead of breaking the world
(RELENG-101)
|
|
| Status: | Resolved |
| Project: | releng |
| Component/s: | None |
| Affects Version/s: | None |
| Fix Version/s: | None |
| Type: | Sub-task | Priority: | Medium |
| Reporter: | Michael Vorburger | Assignee: | Michael Vorburger |
| Resolution: | Done | Votes: | 0 |
| Labels: | None | ||
| Remaining Estimate: | Not Specified | ||
| Time Spent: | Not Specified | ||
| Original Estimate: | Not Specified | ||
| Description |
|
While experimenting with using The Bot for mdsal:55/69355/34,mdsal:62/69362/31,... which is NOK, because the the multipatch job does not support this - it will cherry-pick both changes SEPARATELY into a fresh git clone; which is not what we want , and will fail as the 2nd is dependant on the 1st so cherry-pick fails. I can think of 2 ways to make better tooling for this situation - let's discuss here and agree: 1. Either, I make the The Bot smart enough to detect parental ancestry of changes for the same project on a topic (that's probably doable), so that it spits out this PATCHES_TO_BUILD magic string instead of above: mdsal=62/69362/31,... This should work, with the minor disadvantage that if such patch series are not rebased, it could build outdated code (which the cherry pick avoids) and potentially give false results. That could be addressed if the multipatch job would just do a rebase after checkout ... 2. the multipatch job, or it's successor in RELENG-102, could allow specifying a list of patches to cherry pick as above, and pick EACH of them into the SAME git clone. This would probably mean that The Bot will have to order them by their Parent, as the job probably can't (easily) do that? skitt ecelgp zxiiro jluhrsen dfarrell07 any thoughts which way to go? |
| Comments |
| Comment by Michael Vorburger [ 02/May/18 ] |
|
skitt and I have just further discussed this by voice. It turns out that I am just dumb and apparently this would be better: mdsal:55/69355/34:62/69362/31,... But The Bot will have to order them by their Parent - let me see how hard that would be to implement... |
| Comment by Luis Gomez [ 02/May/18 ] |
|
Yes the above suggested format works to cherry-pick multiple patches for the same project. |
| Comment by Michael Vorburger [ 07/May/18 ] |
|
> But The Bot will have to order them by their Parent - let me see how hard that would be to implement... this took a little more effort than I had hoped (or technically really had time) for, but it now works!
|
[RELENG-106]