MR consolidation research

[majamassarini]

No description provided.

[TomasTomecek]

thank you, very nice research! I stopped reading at 50% because it was getting way too long, sorry 😊

[lbarcziova]

thanks Maja! I agree to start iterating with approach 1 and decide based on it where to go with it.

[antbob]

There is a fairly common backport consolidation case that is not being addressed here (maybe it should be addressed separately but its up to you) and that is some patches either address multiple issues at once ie in a single patch/commit. An example of this would be a commit that addresses multiple CVE fixes either in a single patch or multiple patches. Each of those CVEs would have a separate Jira issue associated (one Jira for each CVE). The agent needs to detect that and

1. Update all related Jira issues
2. Include all related Jira references in Resolves/Related commit message

in order for the automation pipeline to pick them up and update everything accordingly further down the line eg testing, errata tool and whatever else is in there.

This might be a bit tricky to do but the original commit (the one being backported) would have its own Jira issues listed in commit message "Resolves:/Related:" line/s. Each of the Jira issues listed there can be searched for to find related Jira issues for specific stream the agent is currently backporting to and once all of those are found they can be added to its own commit "Resolves:/Related:" line/s followed by update to the Jira issues themselves as needed.

[majamassarini]

There is a fairly common backport consolidation case that is not being addressed here (maybe it should be addressed separately but its up to you) and that is some patches either address multiple issues at once ie in a single patch/commit. An example of this would be a commit that addresses multiple CVE fixes either in a single patch or multiple patches. Each of those CVEs would have a separate Jira issue associated (one Jira for each CVE). The agent needs to detect that and

1. Update all related Jira issues
2. Include all related Jira references in Resolves/Related commit message

in order for the automation pipeline to pick them up and update everything accordingly further down the line eg testing, errata tool and whatever else is in there.

This might be a bit tricky to do but the original commit (the one being backported) would have its own Jira issues listed in commit message "Resolves:/Related:" line/s. Each of the Jira issues listed there can be searched for to find related Jira issues for specific stream the agent is currently backporting to and once all of those are found they can be added to its own commit "Resolves:/Related:" line/s followed by update to the Jira issues themselves as needed.

Thanks for bringing this up!
I see this scenario as similar to the consolidation of rebuilds. So I would address it in a similar way. To address it, I would create another issue.
I will update the research with both scenarios and propose a plan for the second one.

[antbob]

The solution would also need to include Jira issue updates for each separate CVE (or non CVE issue for that matter) issue:

1. transition each Jira issue to "In Progress" as it is required by the downstream automation.
2. add a comment to each Jira issue indicating is part of the backport OR link to related MR.

Under (1) once MR is merged then all related Jira issues will have fixedInBuild field updated and Preliminary Testing set to Requested by the downstream automation pipeline and then once Preliminary Testing is Pass the downstream automation pipeline will transition each issue to Integration and attach it to new or existing errata.

[majamassarini]

I will add both points to the doc, thanks!
The rebuild consolidation already comments on all consolidated jira issues, but it does not change the status to "In Progress". @lbarcziova do you think we need to change the behaviour also in the rebuild consolidation? Or should we diverge in this aspect?

[lbarcziova]

we can do that to be consistent with backport/rebase