Help people remember to merge labs/private git
Closed, ResolvedPublic
Actions

Assigned To

Authored By

	Andrew
	Jul 18 2019, 3:47 PM

Description

@CDanis suggests two short-term bandaids for this:

Modify the puppet-merge script so it attempts to do a labs/private merge at the end of every run. Advantages of this are: a) users don't need to remember the --labs-private switch b) people merging prod patches will get reminded about pending labs/private patches if there are any

Add monitoring for unmerged patches in labs/private

Details

	Subject	Repo	Branch	Lines +/-
	Add monitoring for unmerged patches in the /labs/private repo	operations/puppet	production	+3 -0
	puppet-merge: include a --labsprivate run	operations/puppet	production	+11 -0

Customize query in gerrit

Related Objects
Search...

Status	Assigned	Task
Open	None	T294906 Puppet Improvements
Open	None	T285539 Easing pain points caused by divergence between cloudservices and production puppet usecases
Open	None	T226270 Reduce the effects of puppet breakage on VPS
Open	None	T227029 Prevent catalog breakage on cloud instances by decoupling core cloud puppetmaster from custom puppetmasters
Resolved	Andrew	T228443 Help people remember to merge labs/private git

Event Timeline

Andrew created this task.Jul 18 2019, 3:47 PM

CDanis awarded a token.Jul 18 2019, 4:05 PM

Change 524265 had a related patch set uploaded (by Andrew Bogott; owner: Andrew Bogott):
[operations/puppet@production] puppet-merge: re-run with --labsprivate if there's nothing to merge in prod

https://gerrit.wikimedia.org/r/524265

gerritbot added a project: Patch-For-Review.Jul 18 2019, 4:25 PM

Change 524268 had a related patch set uploaded (by Andrew Bogott; owner: Andrew Bogott):
[operations/puppet@production] Add monitoring for unmerged patches in the /labs/private repo

https://gerrit.wikimedia.org/r/524268

bd808 moved this task from Inbox to Doing on the cloud-services-team (Kanban) board.Jul 18 2019, 5:30 PM

Change 524265 merged by Andrew Bogott:
[operations/puppet@production] puppet-merge: include a --labsprivate run

https://gerrit.wikimedia.org/r/524265

Change 524268 merged by Andrew Bogott:
[operations/puppet@production] Add monitoring for unmerged patches in the /labs/private repo

https://gerrit.wikimedia.org/r/524268

Maintenance_bot removed a project: Patch-For-Review.Jul 18 2019, 7:10 PM

Andrew closed this task as Resolved.Jul 18 2019, 7:42 PM

I updated the docs:
https://wikitech.wikimedia.org/w/index.php?title=Puppet&type=revision&diff=1833007&oldid=1828050

bd808 mentioned this in T161675: Re-think puppet management for deployment-prep.Mar 19 2021, 11:50 PM