Details
-
Task
-
Resolution: Fixed
-
P1: Critical
-
None
-
None
-
None
-
4a8cba6b2 (v3.5-based)
Description
When an integration passes, the qt workflow plugin for gerrit merges changes into the target branch. First, a Fast-Forward strategy is tried. If that fails, changes are cherry-picked onto the target branch one-by-one. This latter behavior ultimately results in new commits being generated during the merge process. As a result, COIN data is no longer up-to-date and references shas which may not exist in the final git history following the merge.
To resolve this, the qt workflow plugin for gerrit should perform the merge action and respond to COIN with the resulting shas of each merged change. The plugin should additionally include the sha which sits on top of the commit stack, representing the sole sha from the integration which includes all other tested changes when examining the target branch following the merge.
Attachments
Issue Links
- resulted in
-
COIN-974 Save sha value of task after it has been merged to target branch
-
- Closed
-
For Gerrit Dashboard: QTQAINFRA-5179 | ||||||
---|---|---|---|---|---|---|
# | Subject | Branch | Project | Status | CR | V |
443329,2 | Modify build approve command to return merged sha1 | v3.5-based | qtqa/gerrit-plugin-qt-workflow | Status: MERGED | +2 | 0 |