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

Prevent merging commits without changelogs in qtqa/tqtc-coin-ci.git production branches

    XMLWordPrintable

    Details

    • Type: Task
    • Status: Reported
    • Priority: P2: Important
    • Resolution: Unresolved
    • Affects Version/s: None
    • Fix Version/s: None
    • Component/s: Gerrit
    • Labels:
      None
    • Technical Risk:
      Normal

      Description

      At the moment, we are busy with defining a new workflow for Coin project that will require changelogs for every commit that is merged in a production branch.

      The changelogs provide human readable information in condensed format for Coin users that either do not have access to the internal project or simply want to view commits in Gerrit without needing to use git tools.

      The changelogs will contain the COMMIT-SHA1 of the change which will be included in the diff of the commit.

       

      Example.

       

      commit a0e61e592dd5985ce002f12082cd6f879df97fc6
      Author: Aapo Keskimolo <aapo.keskimolo@qt.io>
      Date:   Wed Feb 26 16:10:36 2020 +0200    Allow production to publish its own tags
          
          In order to support coin revisions, the run ci script is amended with ability
          to create and push annotated tags to the remote repository.
          
          This will allow ensuring that during every start up of coin, we have public
          version accessible in gerrit.
          
          If previous tag exists, no tag will be created. If git describe returns tag
          suffixed with commits, a new tag will be created on top of the most recent
          tag with incremented (+1) patch version.
          
          Example.
           v1.3.2-2-gaf1gd3a -> v1.3.3
          
          Example.
           v1.3.2 -> v1.3.2
          
          Change-Id: Ied7c83a2ab9918624457d31b4e770e1e7b101245
          Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>diff --git a/doc/changelog.rst b/doc/changelog.rst
      index ef02899d..e1d4b21c 100644
      --- a/doc/changelog.rst
      +++ b/doc/changelog.rst
      @@ -1,3 +1,14 @@
      +Coin test-versioning (2020/03/09)
      +=================================
      +
      +Misc
      +----
      +
      +- `a0e61e592dd5985ce002f12082cd6f879df97fc6   <https://codereview.qt-project.org/#/q/Ied7c83a2ab9918624457d31b4e770e1e7b101245,n,z>`_ `Allow production to publish its own tags`
      

      The change above has a valid doc/changelog.rst entry that is targeted towards production branch 1.3.

      If the commit does not contain a valid changelog entry then either the review or push of the commit should be prevented. This would ensure that all changes merged in production branches have changelogs attached to them.

        Attachments

        For Gerrit Dashboard: QTQAINFRA-3606
        # Subject Branch Project Status CR V

          Activity

            People

            Assignee:
            gerrit-admin Gerrit Admin
            Reporter:
            aakeskimo Aapo Keskimölö
            Votes:
            0 Vote for this issue
            Watchers:
            2 Start watching this issue

              Dates

              Created:
              Updated:

                Gerrit Reviews

                There are no open Gerrit changes