Page MenuHomeSoftware Heritage

Update for swh-objstorage >= 2.0.0
Needs ReviewPublic

Authored by vlorentz on Tue, Jul 19, 3:14 PM.

Details

Summary
  • objstorage.add() now requires an id as second argument
  • objstorage.get() now allows a dict of hashes instead of just sha1, and a future version will require this dict
Test Plan

Depends on D8122

Diff Detail

Repository
rDDATASET Datasets
Branch
master
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 30455
Build 47612: Phabricator diff pipeline on jenkinsJenkins console · Jenkins
Build 47611: arc lint + arc unit

Event Timeline

Build has FAILED

Patch application report for D8138 (id=29381)

Rebasing onto c8e77380e1...

First, rewinding head to replay your work on top of it...
Applying: Update for swh-objstorage >= 2.0.0
Using index info to reconstruct a base tree...
M	swh/dataset/test/test_orc.py
Falling back to patching base and 3-way merge...
Auto-merging swh/dataset/test/test_orc.py
CONFLICT (content): Merge conflict in swh/dataset/test/test_orc.py
Patch failed at 0001 Update for swh-objstorage >= 2.0.0

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 c8e77380e1...

Already up to date.
Changes applied before test
commit b108940d6f590e8ae5afcbdf6141f1f90184a5ec
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Tue Jul 19 15:13:53 2022 +0200

    Update for swh-objstorage >= 2.0.0
    
    * objstorage.add() now requires an id as second argument
    * objstorage.get() now allows a dict of hashes instead of just
      sha1, and a future version will require this dict

Link to build: https://jenkins.softwareheritage.org/job/DDATASET/job/tests-on-diff/149/
See console output for more information: https://jenkins.softwareheritage.org/job/DDATASET/job/tests-on-diff/149/console

Harbormaster returned this revision to the author for changes because remote builds failed.Tue, Jul 19, 3:16 PM
Harbormaster failed remote builds in B30455: Diff 29381!

Build has FAILED

Patch application report for D8138 (id=29381)

Rebasing onto c8e77380e1...

First, rewinding head to replay your work on top of it...
Applying: Update for swh-objstorage >= 2.0.0
Using index info to reconstruct a base tree...
M	swh/dataset/test/test_orc.py
Falling back to patching base and 3-way merge...
Auto-merging swh/dataset/test/test_orc.py
CONFLICT (content): Merge conflict in swh/dataset/test/test_orc.py
Patch failed at 0001 Update for swh-objstorage >= 2.0.0

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 c8e77380e1...

Already up to date.
Changes applied before test
commit b108940d6f590e8ae5afcbdf6141f1f90184a5ec
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Tue Jul 19 15:13:53 2022 +0200

    Update for swh-objstorage >= 2.0.0
    
    * objstorage.add() now requires an id as second argument
    * objstorage.get() now allows a dict of hashes instead of just
      sha1, and a future version will require this dict

Link to build: https://jenkins.softwareheritage.org/job/DDATASET/job/tests-on-diff/150/
See console output for more information: https://jenkins.softwareheritage.org/job/DDATASET/job/tests-on-diff/150/console