Double merge and failed runs with a CPI MP

[Matias Bordese]

This seems to be the run where it got first merged (before the last commit got in):
https://jenkins.ols.canonical.com/online-services/job/click-package-index/47/console

I'm sure I didn't top-approve the MP, but maybe someone else? So I never noticed this was merged until I pushed my last changes (suggestions from the review) and then top-approved.

Successive runs (including the changes from the last commit) were failing until Daniel moved it back to Needs Review, voted and re-top-approved. Then the MP got merged, again:

https://jenkins.ols.canonical.com/online-services/job/click-package-index/77/console

[1] https://code.launchpad.net/~matiasb/click-package-index/check-for-device-refresh/+merge/316618

[Vincent Ladeuil (vila)]

https://jenkins.ols.canonical.com/online-services/job/click-package-index/47/console mentions:

16:29:26 E: Merging https://code.launchpad.net/~matiasb/click-package-index/check-for-device-refresh at revision <email address hidden>

https://jenkins.ols.canonical.com/online-services/job/click-package-index/77/console

18:19:35 E: Merging https://code.launchpad.net/~matiasb/click-package-index/check-for-device-refresh at revision <email address hidden>

Setting the status to Approve on a launchpad merge proposal sets the reviewed_revid proposal attribute.

The value is pre-loaded in the page with that last revision presented there.

So the scenario is: load the MP page at revision N, push N+1, top approve (approving and triggering landing N).

[Vincent Ladeuil (vila)]

Unless I'm mistaken, this has been caused by top-approving without refreshing the page.

Feel free to re-open if this recurs.

[Vincent Ladeuil (vila)]

Fixed again differently.

ols jenkaas will now check that there is something to merge or reject the proposal.

See https://code.launchpad.net/~fgallina/software-center-agent/reduce-uses-of-enable_snap_developer-switch/+merge/319243 for an example.

This should only happen if launchpad is too slow to mark the MP as merged (or if jenkaas is too fast to pick it up).