wmf_deploy updated but not merged and deployed into .12
Closed, ResolvedPublic1 Estimated Story Points
Actions

Assigned To

Authored By

	Reedy
	Jan 16 2019, 12:38 PM

Description

https://gerrit.wikimedia.org/r/#/c/mediawiki/extensions/CentralNotice/+/484352/-1..2 was merged to bump CN in .13, but it wasn't deployed to .12, leaving .12 in an inconsistent state

This task acts as three things:

A reminder that wmf_deploy affects multiple branches
Please remember to deploy your changes to all active branches, even if you intend for it to just ride the train on the latest release, you still need to deploy it for any active older releases :)
Please deploy the change above properly into .12 to fix the below

	modified:   extensions/CentralNotice (new commits)

Details

	Subject	Repo	Branch	Lines +/-
	CentralNotice to already deployed I6ff16ef549308047b1cade1613b2527b6ed99bae	mediawiki/core	wmf/1.33.0-wmf.12	+1 -1
	CentralNotice to already deployed I6ff16ef549308047b1cade1613b2527b6ed99bae	mediawiki/core	wmf/1.33.0-wmf.13	+1 -1

Customize query in gerrit

Related Objects

Mentioned Here: T113428: CentralNotice: make-wmf-branch doesn't work for named extension deployment branches
T136904: Spike: Plan reforms of the CentralNotice deployment branch
T179536: Unexpected side-effect of CentralNotice wmf_deploy branch strategy

Event Timeline

Reedy created this task.Jan 16 2019, 12:38 PM

Restricted Application added a subscriber: Aklapper. · View Herald TranscriptJan 16 2019, 12:38 PM

Reedy triaged this task as High priority.Jan 16 2019, 12:39 PM

Reedy updated the task description. (Show Details)

• cwdent edited projects, added Fundraising-Backlog; removed fundraising-tech-ops.Jan 16 2019, 3:07 PM

Addshore awarded a token.Jan 16 2019, 4:23 PM

Addshore subscribed.

Ejegg subscribed.Jan 16 2019, 4:59 PM

Change 484731 had a related patch set uploaded (by AndyRussG; owner: AndyRussG):
[mediawiki/core@wmf/1.33.0-wmf.13] CentralNotice to already deployed I6ff16ef549308047b1cade1613b2527b6ed99bae

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

Change 484731 abandoned by AndyRussG:
CentralNotice to already deployed I6ff16ef549308047b1cade1613b2527b6ed99bae

Reason:
Wrong branch!!?

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

Change 484734 had a related patch set uploaded (by AndyRussG; owner: AndyRussG):
[mediawiki/core@wmf/1.33.0-wmf.12] CentralNotice to already deployed I6ff16ef549308047b1cade1613b2527b6ed99bae

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

Work on fixing the CentralNotice deployment mechanism has been put off time after time. We really, really need to get to it. I think this is the main task we can use to plan this: T136904. Other older ones are: T179536, T113428.

@Reedy, @Addshore, many apologies again for the headaches this causes.

Please deploy the change above properly into .12 to fix the below

I tried to do this, using this as a rough guide. See the attached patch (just the last one). I hope this is correct, and helps smooth the remaining deploys this week. Please lmk. :)

Thanks and apologies again!!!!

You just need to update the git sub module for CN on deploy1001 and sync it :)

In T213915#4885571, @Reedy wrote:

You just need to update the git sub module for CN on deploy1001 and sync it :)

With or without the attached patch?

Shouldn’t need that. It’s already in the core branch as that’s tracking wmf_deploy...

In T213915#4885692, @Reedy wrote:

Shouldn’t need that. It’s already in the core branch as that’s tracking wmf_deploy...

That would set wmf.12 to the new wmf_deploy head, no? I would be a bit happier to keep wmf.12 on what's currently deployed for that branch... I think that's what the provided patch would do?

Oh, sorry. I thought you wanted to deploy the new version

Not checked the hashes, but looks right if you don’t want to bump it :)

Change 484734 merged by jenkins-bot:
[mediawiki/core@wmf/1.33.0-wmf.12] CentralNotice to already deployed I6ff16ef549308047b1cade1613b2527b6ed99bae

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