1436537 - scripts/deploy_bug.py does the wrong thing regarding merge commits

Status: RESOLVED FIXED

(Socorro :: General, task, P1)

Description

[Will Kahn-Greene [:willkg] ET needinfo? me]

scripts/deploy_bug.py is used to write up deploy bugs. It suggests which sha to use to create the next tag in the socorro repo.

Deploy 308 (bug #1436472) failed because it suggested the wrong sha.

This bug covers fixing it so it's correct.

Plus I use a similar script for Antenna, so I should fix that one, too.

Comment 1

[Will Kahn-Greene [:willkg] ET needinfo? me]

Grabbing this to fix asap because it makes deploys hard.

Comment 2

[Will Kahn-Greene [:willkg] ET needinfo? me]

Attachment: pr 4328: fixes bug 1436537 - fixes sha to tag with in deploy_bug.py

Comment 3

[[github robot]]

Commits pushed to master at https://github.com/mozilla-services/socorro

https://github.com/mozilla-services/socorro/commit/090afbe26c5835a6775e8d0b61483955c463bda3
fixes bug 1436537 - fixes sha to tag with in deploy_bug.py

Previously we removed the merge commits from the list of commits that got
displayed and then figured out the commit to tag by looking at the last commit
in that list. However, that's wrong--we really want the last commit and not
the last non-merge commit especially since the last commit is likely to be
a merge commit.

This fixes that. It also cleans up the code a bit.

https://github.com/mozilla-services/socorro/commit/2644aac98c00c95cb054feb269fe187448d9bee7
Merge pull request #4328 from willkg/1436537-deploy-bug

fixes bug 1436537 - fixes sha to tag with in deploy_bug.py