Uploaded image for project: 'Qt Quality Assurance Infrastructure'
  1. Qt Quality Assurance Infrastructure
  2. QTQAINFRA-5179

Qt Workflow plugin should ping coin with merged shas

    XMLWordPrintable

Details

    • Task
    • Resolution: Fixed
    • P1: Critical
    • None
    • None
    • Gerrit
    • 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

          No reviews matched the request. Check your Options in the drop-down menu of this sections header.

          Activity

            People

              jujokini Jukka Jokiniva
              daniel.smith Daniel Smith
              Votes:
              0 Vote for this issue
              Watchers:
              6 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved:

                Gerrit Reviews

                  There are no open Gerrit changes