Maniphest T258451

deployment-puppetmaster04: git-sync-upstream is failing with a merge conflict since 2020-07-17T08:50:01Z
Closed, ResolvedPublic
Actions

Assigned To

Authored By

	• Mholloway
	Jul 20 2020, 10:02 PM

Tags

Referenced Files

None

Subscribers

Description

The git-sync-upstream script is failing on deployment-puppetmaster04 due to a merge conflict with a local commit, and consequently the Beta Cluster hasn't received any Puppet changes made since then.

The conflict appears to be between this commit and local commit d94fd12 ("prometheus: make ferm DNS record type configurable").

Related Objects
Search...

		Status	Subtype	Assigned	Task
		Öffnen Sie		None	T215217 deployment-prep (beta cluster): Code stewardship request
		Resolved		jbond	T258451 deployment-puppetmaster04: git-sync-upstream is failing with a merge conflict since 2020-07-17T08:50:01Z

Event Timeline

• Mholloway created this task.Jul 20 2020, 10:02 PM

Restricted Application added a subscriber: Aklapper. · View Herald TranscriptJul 20 2020, 10:02 PM

• Mholloway triaged this task as High priority.Jul 20 2020, 10:02 PM

• Mholloway updated the task description. (Show Details)

• Mholloway added a parent task: T215217: deployment-prep (beta cluster): Code stewardship request.Jul 21 2020, 5:01 PM

/cc @elukey @jbond per https://gerrit.wikimedia.org/r/c/operations/puppet/+/612507.

Krinkle unsubscribed.Jul 21 2020, 6:02 PM

@Krinkle I have manuly resolved the conflicts and things look good to me, is someone able to confirm that things are working as expected now?

Yes, this is working well again, thank you @jbond.

• Mholloway reassigned this task from • Mholloway to jbond.Jul 22 2020, 2:40 PM

Great thanks, resolving

jbond closed this task as Resolved.Jul 22 2020, 2:48 PM