replayer/replay: Remove no longer needed tenacity workarounds
AbandonedPublic
Actions

Authored by anlambert on Dec 8 2021, 12:10 PM.

Details

Reviewers

Group Reviewers

Summary

Now that we have packaged tenacity 6.2 for debian buster and use it
in production, we can remove the workarounds to support tenacity < 5.

Diff Detail

Repository

rDOBJSRPL Content replayer

Branch

master

Lint

No Linters Available

Unit

No Unit Test Coverage

Build Status

Buildable 25478
Build 39826: Phabricator diff pipeline on jenkins	Jenkins console · Jenkins
Build 39825: arc lint + arc unit

Event Timeline

anlambert created this revision.Dec 8 2021, 12:10 PM

Herald added a reviewer: Reviewers. · View Herald TranscriptDec 8 2021, 12:10 PM

Build is green

Patch application report for D6786 (id=24619)

Rebasing onto 86b8509fc2...

First, rewinding head to replay your work on top of it...
Applying: replayer/replay: Remove no longer needed tenacity workarounds
Using index info to reconstruct a base tree...
M	requirements.txt
M	swh/objstorage/replayer/replay.py
Falling back to patching base and 3-way merge...
Auto-merging swh/objstorage/replayer/replay.py
CONFLICT (content): Merge conflict in swh/objstorage/replayer/replay.py
Auto-merging requirements.txt
CONFLICT (content): Merge conflict in requirements.txt
Patch failed at 0001 replayer/replay: Remove no longer needed tenacity workarounds

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

Rebase failed (ret=1)!

Could not rebase; Attempt merge onto 86b8509fc2...

Already up to date.

Changes applied before test

commit 266c8d37d7b3b81d36f65d056a616cd99652d5ca
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date:   Wed Dec 8 12:08:43 2021 +0100

    replayer/replay: Remove no longer needed tenacity workarounds
    
    Now that we have packaged tenacity 6.2 for debian buster and use it
    in production, we can remove the workarounds to support tenacity < 5.

See https://jenkins.softwareheritage.org/job/DOBJSRPL/job/tests-on-diff/25/ for more details.

Harbormaster completed remote builds in B25478: Diff 24619.Dec 8 2021, 12:12 PM

anlambert requested review of this revision.Dec 8 2021, 12:12 PM

ardumont accepted this revision.Dec 8 2021, 12:30 PM

This revision is now accepted and ready to land.Dec 8 2021, 12:30 PM

Turns out it has already been handled in rDOBJSRPL8098798820bb2025f9bfc7c6b2b46e08a818b797, my local repo was not up to date.