deposit.loader: Make archive.tar the default_filename
ClosedPublic
Actions

Authored by ardumont on Mar 5 2021, 4:02 PM.

Details

Reviewers

Group Reviewers

Maniphest Tasks

T3070: Fix longstanding deposit status verified which is usually a symptom of loading failure
T3094: deposit: Internal deposit api should send the "archive.tar" name to the deposit loader

Commits

rDLDBASEd14fbd2a9f11: deposit.loader: Make archive.tar the default_filename

Summary

The main change from using tar in the deposit has been released so we can flip from
archive.zip to archive.tar.

Build fails for unrelated reasons (master one fails as well)

The real improvment would be T3094 but this is left as an easy-hack task.

Related to T3094
Related to T3070

Depends on D5205

Test Plan

tox

Diff Detail

Repository

rDLDBASE Generic VCS/Package Loader

Branch

master

Lint

No Linters Available

Unit

No Unit Test Coverage

Build Status

Buildable 19744
Build 30648: Phabricator diff pipeline on jenkins	Jenkins console · Jenkins
Build 30647: arc lint + arc unit

Unit TestsFailed
View All

	Time	Test
	430 ms	Jenkins > .tox.py3.lib.python3.7.site-packages.swh.loader.package.deposit.tests.test_deposit::test_deposit_loading_ok_2 swh_storage = <swh.storage.retry.RetryingProxyStorage object at 0x7f09ac2b3128> deposit_client = <swh.loader.package.deposit.loader.ApiClient object at 0x7f09ac24c198> requests_mock_datadir = <requests_mock.mocker.Mocker object at 0x7f09ac242e48>
	1 ms	Jenkins > .tox.py3.lib.python3.7.site-packages.swh.loader.core.tests.test_converters::test_content_for_storage_data
	4 ms	Jenkins > .tox.py3.lib.python3.7.site-packages.swh.loader.core.tests.test_converters::test_content_for_storage_path
	1 ms	Jenkins > .tox.py3.lib.python3.7.site-packages.swh.loader.core.tests.test_converters::test_content_for_storage_too_long
	1 ms	Jenkins > .tox.py3.lib.python3.7.site-packages.swh.loader.core.tests.test_converters::test_prepare_contents
		View Full Test Results (1 Failed · 156 Passed)

Event Timeline

ardumont created this revision.Mar 5 2021, 4:02 PM

ardumont published this revision for review.Mar 5 2021, 4:03 PM

Build has FAILED

Patch application report for D5204 (id=18645)

Rebasing onto 4faa49aa9d...

Current branch diff-target is up to date.

Changes applied before test

commit 4f6ab658db09e2bb4943db584d4b633b7261f22b
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri Mar 5 16:00:14 2021 +0100

    deposit.loader: Make archive.tar the default_filename
    
    The main change from using tar in the deposit has been released so we can flip from
    archive.zip to archive.tar.
    
    Related to T3094
    Related to T3070

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

Harbormaster failed remote builds in B19738: Diff 18645!Mar 5 2021, 4:04 PM

ardumont edited the summary of this revision. (Show Details)Mar 5 2021, 4:51 PM

ardumont added a parent revision: D5205: tests: recompute ids when evolving RawExtrinsicMetadata objects.

Build has FAILED

Patch application report for D5204 (id=18645)

Rebasing onto 4faa49aa9d...

Current branch diff-target is up to date.

Changes applied before test

commit 4f6ab658db09e2bb4943db584d4b633b7261f22b
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri Mar 5 16:00:14 2021 +0100

    deposit.loader: Make archive.tar the default_filename
    
    The main change from using tar in the deposit has been released so we can flip from
    archive.zip to archive.tar.
    
    Related to T3094
    Related to T3070

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

(Just to trigger a new build, click-click in the ui did not work, arc patch D5205,
rebase this and trigger tox works ¯\_(ツ)_/¯)

so please do build and...
Depends on D5205

Build has FAILED

Patch application report for D5204 (id=18651)

Rebasing onto 4faa49aa9d...

Current branch diff-target is up to date.

Changes applied before test

commit 4f6ab658db09e2bb4943db584d4b633b7261f22b
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri Mar 5 16:00:14 2021 +0100

    deposit.loader: Make archive.tar the default_filename
    
    The main change from using tar in the deposit has been released so we can flip from
    archive.zip to archive.tar.
    
    Related to T3094
    Related to T3070

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

Harbormaster failed remote builds in B19744: Diff 18651!Mar 5 2021, 4:59 PM

Rebase

Build is green

Patch application report for D5204 (id=18657)

Rebasing onto 5ac60fa291...

Current branch diff-target is up to date.

Changes applied before test

commit d14fbd2a9f11b40b431eb93ac7089beac5d34330
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri Mar 5 16:00:14 2021 +0100

    deposit.loader: Make archive.tar the default_filename
    
    The main change from using tar in the deposit has been released so we can flip from
    archive.zip to archive.tar.
    
    Related to T3094
    Related to T3070

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

Harbormaster completed remote builds in B19750: Diff 18657.Mar 5 2021, 5:20 PM

vlorentz accepted this revision.Mar 8 2021, 10:02 AM

This revision is now accepted and ready to land.Mar 8 2021, 10:02 AM

Closed by commit rDLDBASEd14fbd2a9f11: deposit.loader: Make archive.tar the default_filename (authored by ardumont). · Explain WhyMar 8 2021, 11:22 AM

This revision was automatically updated to reflect the committed changes.

ardumont added a commit: rDLDBASEd14fbd2a9f11: deposit.loader: Make archive.tar the default_filename.