scap backport check prevents using it to fix an about-to-be-live branch
Open, Needs TriagePublic
Actions

Assigned To

None

Authored By

	dancy
	Sep 14 2022, 6:21 PM

Description

Scenario: After rolling an new train branch 1.40.0-wmf.1 to testwikis, errors were seen that resulted in rollback to 1.39.0-wmf.28. A fix was eventually prepared for 1.40.0-wmf.1 and I tried to use scap backport to merge, pull, and (effectively no-op) deploy it.

dancy@deploy1002:~$ scap backport https://gerrit.wikimedia.org/r/c/mediawiki/core/+/831985
18:09:32 Checking whether changes are in a branch and version deployed to production...
18:09:32 Change '831985' branch '1.40.0-wmf.1' not valid for any deployed wikiversion. Deployed wikiversions: ['1.39.0-wmf.28']

We need a way to allow this to proceed anyway (if the branch has already been checked out).

or the error message should provide advice on what to do in this situation, which is:

+2 the change in the Gerrit UI and wait for it to merge
Run scap deploy-promote testwikis <new-version> on the deploy server.

Event Timeline

dancy created this task.Sep 14 2022, 6:21 PM

Restricted Application added a subscriber: Aklapper. · View Herald TranscriptSep 14 2022, 6:21 PM

dancy updated the task description. (Show Details)Sep 14 2022, 6:28 PM

dancy added projects: Scap, Release-Engineering-Team.Sep 14 2022, 6:34 PM

what about having it do everything except sync if it's not deployed anywhere?

thcipriani edited projects, added Release-Engineering-Team (Priority Backlog 📥); removed Release-Engineering-Team.Sep 14 2022, 8:52 PM

In T317795#8237322, @jeena wrote:

what about having it do everything except sync if it's not deployed anywhere?

Yeah, that sounds good (after some interactive prompt asking the operator if that is what they want).

thcipriani edited projects, added Release-Engineering-Team (Onboarding 🚀); removed Release-Engineering-Team (Priority Backlog 📥).Jun 9 2023, 9:01 PM

thcipriani renamed this task from scap backport sanity check prevents using it to fix an about-to-be-live branch to scap backport check prevents using it to fix an about-to-be-live branch.Jun 9 2023, 9:11 PM

Just tested this and as it works currently, It will continue to merge and deploy as directed by the user, but will fail with an error if the branch is not staged.

In T317795#8919953, @jeena wrote:

Just tested this and as it works currently, It will continue to merge and deploy as directed by the user, but will fail with an error if the branch is not staged.

oh, so this one is done?

No, I think it should skip the sync step instead of fail if the branch is not staged.

scap backport check prevents using it to fix an about-to-be-live branchOpen, Needs TriagePublicActions

Description

Event Timeline

scap backport check prevents using it to fix an about-to-be-live branch
Open, Needs TriagePublic
Actions