patches in a mess
Closed, ResolvedPublic
Actions

Assigned To

Authored By

	Reedy
	Apr 30 2019, 10:27 PM

Description

It seems a mix of scap prep and scap clean aren't necessarily dealing with /srv/patches correctly

Since 1.33.0-wmf.21 to 1.34.0-wmf.3 were not added, nor committed...

1.33.0-wmf.9 to `1.33.0-wmf.16 files and dirs were deleted, but not committed

Example (simplified and redacted):

reedy@deploy1001:/srv/patches$ git status
On branch master
Changes not staged for commit:
  (use "git add/rm <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

	deleted:    1.33.0-wmf.12/core/01-REDACTED.patch
	deleted:    1.33.0-wmf.13/core/01-REDACTED.patch
	deleted:    1.33.0-wmf.14/core/01-REDACTED.patch
	deleted:    1.33.0-wmf.16/core/01-REDACTED.patch
	deleted:    1.33.0-wmf.9/core/01-REDACTED.patch

Untracked files:
  (use "git add <file>..." to include in what will be committed)

	1.33.0-wmf.21/
	1.33.0-wmf.22/
	1.33.0-wmf.23/
	1.33.0-wmf.24/
	1.33.0-wmf.25/
	1.34.0-wmf.1/
	1.34.0-wmf.3/

no changes added to commit (use "git add" and/or "git commit -a")

Details

Related Changes in Gerrit:

	Subject	Repo	Branch	Lines +/-
	scap: prep and clean git ops for /srv/patches	operations/mediawiki-config	master	+17 -4

Customize query in gerrit

Event Timeline

Reedy created this task.Apr 30 2019, 10:27 PM

Restricted Application added a subscriber: Aklapper. · View Herald TranscriptApr 30 2019, 10:27 PM

Jdforrester-WMF subscribed.Apr 30 2019, 10:32 PM

greg added a project: Release-Engineering-Team-TODO.Jun 21 2019, 10:31 PM

greg edited projects, added Release-Engineering-Team (Deployment services); removed Release-Engineering-Team.Jun 24 2019, 9:20 PM

greg triaged this task as Medium priority.Jul 23 2019, 8:49 PM

greg moved this task from Needs triage to Debt on the Scap board.

greg moved this task from Should be empty (use Release-Engineering-Team) to Soon-ish on the Release-Engineering-Team-TODO board.

afaik scap patch doesn't automatically manage the git repo in /srv/patches, though it probably should.

Change 526509 had a related patch set uploaded (by Thcipriani; owner: Thcipriani):
[operations/mediawiki-config@master] scap: prep and clean git ops for /srv/patches

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

gerritbot added a project: Patch-For-Review.Jul 30 2019, 7:03 PM

Change 526509 merged by jenkins-bot:
[operations/mediawiki-config@master] scap: prep and clean git ops for /srv/patches

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

Mentioned in SAL (#wikimedia-operations) [2019-12-03T19:07:02Z] <thcipriani@deploy1001> Synchronized scap/plugins: [[gerrit:526509|scap: prep and clean git ops for /srv/patches]] T222240 (no-op sync) (duration: 01m 01s)

Maintenance_bot removed a project: Patch-For-Review.Dec 3 2019, 7:10 PM

I manually cleaned-up the repo just now. I also added some git commands to scap clean and scap prep so that when we remove or add a wikiversion in /srv/patches the git repo will be cleaned appropriately.

scap leaving /srv/patches in a messClosed, ResolvedPublicActions

Description

Details

Event Timeline

scap leaving /srv/patches in a mess
Closed, ResolvedPublic
Actions