Reconcile git commits and JIRA tickets (PA 5.0.0)

(Initial planned release date: 2017-06-27)

1) Ensure that all tickets targeted at this release for all components are resolved.

• Use the following filter to view all tickets for all components for this release: https://tickets.puppetlabs.com/issues/?jql=fixVersion+in+%28%27puppet-agent+5.0.0%27%2C+%27PUP+5.0.0%27%2C+%27FACT+3.7.0%27%2C+%27HI+3.4.0%27%2C+%27MCO+2.11.0%27%2C+%27pxp-agent+1.6.0%27%2C+%27cpp-pcp-client+1.5.3%27%29
• Any tickets which are not resolved should be brought to the attention of the appropriate scrum team so they can be resolved for the release.
• Verify tickets have release notes. Ping devs to update tickets with missing release notes.

2) Use the ticketmatch script to ensure all tickets referenced in the commit log have a bug targeted at the release, and ensure all tickets targeted at the release have a corresponding commit. This needs to be done for each component, including puppet-agent itself. This process may reveal tickets that need to be resolved, so this process may need to be repeated a few times.

• cd ~/work
• git clone https://github.com/puppetlabs/ticketmatch
• gem install highline (if you haven't already)
• cd ~/work/<component> for each of puppet, facter, hiera, marionette-collective, pxp-agent, cpp-pcp-client, and puppet-agent
• ruby ../ticketmatch/ticketmatch.rb
  Enter Git From Rev: <previous git tag> (i.e. 4.1.0)
  Enter Git To Rev: |master| stable
  Enter JIRA project: |<JIRA project>| (i.e. PUP)
  Enter JIRA fix version: <JIRA fixVersion to be released> (i.e. PUP 4.2.0)

The output may contain the following headers:

COMMIT TOKENS NOT FOUND IN JIRA (OR NOT WITH FIX VERSION OF ...)

Lists git commits that don't have a corresponding ticket, at least not for the specified fix version. If the commit has a ticket, but the ticket is not targeted correctly, then the ticket's fixVersion should be updated. This can frequently happen if a ticket is initially targeted for a future release (master), but is pulled into an earlier release (stable), but the ticket's fixVersion is not updated.

UNRESOLVED ISSUES NOT FOUND IN GIT

Lists JIRA tickets that have a matching fixVersion, e.g. PUP 4.2.0, but none of the commits have the JIRA ticket in the subject. If the JIRA ticket really is fixed in the release, e.g. the JIRA ticket was typo'ed in the git commit subject, then leave the ticket as is. If the JIRA ticket should not be fixed in the release, e.g. it was originally targeted for the release, but was later bumped out, then update the ticket's fixVersion accordingly, e.g. PUP 4.3.0.

UNRESOLVED ISSUES FOUND IN GIT

Lists JIRA tickets have a git commit, but the ticket is not resolved. Usually this is because the ticket is still passing CI or going through manual validation. It can also occur if a fix is made, but a problem is encountered, and the ticket is reopened. If that happens, make sure the ticket reflects reality, so it's clear the ticket is not actually fixed in the release. Follow up with the appropriate scrum team to ensure the ticket is resolved ASAP.

• Make note in a comment of any tickets in git not found in JIRA (or visa versa) with an explanation of why the ticket is in that state.