Page MenuHomeSoftware Heritage

add a CVS revision type; to be used with the CVS loader
Changes PlannedPublicDraft

Authored by stsp on Tue, Jul 13, 3:28 PM.

Details

Reviewers
None
Group Reviewers
Reviewers

Diff Detail

Repository
rDSTO Storage manager
Branch
master
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 22601
Build 35226: Phabricator diff pipeline on jenkinsJenkins console · Jenkins
Build 35225: arc lint + arc unit

Unit TestsFailed

TimeTest
35 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.storage.tests.algos.test_diff::test__get_rev
request = <SubRequest 'swh_storage_postgresql' for <Function test__get_rev>> @pytest.fixture
37 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.storage.tests.algos.test_origin::test_iter_origin_visit_status
request = <SubRequest 'swh_storage_postgresql' for <Function test_iter_origin_visit_status>> @pytest.fixture
30 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.storage.tests.algos.test_origin::test_iter_origin_visits
request = <SubRequest 'swh_storage_postgresql' for <Function test_iter_origin_visits>> @pytest.fixture
35 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.storage.tests.algos.test_origin::test_iter_origins
request = <SubRequest 'swh_storage_postgresql' for <Function test_iter_origins>> @pytest.fixture
35 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.storage.tests.algos.test_origin::test_origin_get_latest_visit_status_filter_snapshot
request = <SubRequest 'swh_storage_postgresql' for <Function test_origin_get_latest_visit_status_filter_snapshot>> @pytest.fixture
View Full Test Results (194 Failed · 863 Passed · 39 Skipped)

Event Timeline

Harbormaster returned this revision to the author for changes because remote builds failed.Tue, Jul 13, 3:28 PM
Harbormaster failed remote builds in B22595: Diff 21622!

add a CVS revision type; to be used with the CVS loader

Build was aborted

Patch application report for D5991 (id=21629)

Rebasing onto 9747aed6cb...

Current branch diff-target is up to date.
Changes applied before test
commit 631fd3db1d377f8b277a53d0abb3c6784fd192dd
Author: Stefan Sperling <stsp@stsp.name>
Date:   Tue Jul 13 15:23:10 2021 +0200

    add a CVS revision type; to be used with the CVS loader

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

Harbormaster returned this revision to the author for changes because remote builds failed.Tue, Jul 13, 4:46 PM
Harbormaster failed remote builds in B22601: Diff 21629!

Build has FAILED

Patch application report for D5991 (id=21629)

Rebasing onto 9747aed6cb...

Current branch diff-target is up to date.
Changes applied before test
commit 631fd3db1d377f8b277a53d0abb3c6784fd192dd
Author: Stefan Sperling <stsp@stsp.name>
Date:   Tue Jul 13 15:23:10 2021 +0200

    add a CVS revision type; to be used with the CVS loader

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

Build was aborted

Patch application report for D5991 (id=21629)

Rebasing onto 9747aed6cb...

Current branch diff-target is up to date.
Changes applied before test
commit 631fd3db1d377f8b277a53d0abb3c6784fd192dd
Author: Stefan Sperling <stsp@stsp.name>
Date:   Tue Jul 13 15:23:10 2021 +0200

    add a CVS revision type; to be used with the CVS loader

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

Heads up,

You can add yourself to the CONTRIBUTORS file at the top of the repository (within this diff).
(Same goes for other repositories you are updating btw).

Build was aborted

I released a new swh.model v0.2.8 with your adaptation required by this diff.

I triggered back a build for this diff but it got aborted.
It fails for now for unrelated reason to your diff (the build takes too
long and gets aborted).

I'd imagine though that relatedly to this diff, you'd need to update [1] with the
right version (see below) for the diff to pass.

[1] https://forge.softwareheritage.org/source/swh-storage/browse/master/swh/storage/postgresql/db.py$33


As a heads up, this needs a rebase as another diff [2] landed with the 176 db version already.
So you need to update it with 177 now.

[2] D6023

Cheers,

Build was aborted

Patch application report for D5991 (id=21629)

Rebasing onto 912d04ee8a...

First, rewinding head to replay your work on top of it...
Applying: add a CVS revision type; to be used with the CVS loader
Using index info to reconstruct a base tree...
M	swh/storage/sql/30-schema.sql
Falling back to patching base and 3-way merge...
Auto-merging swh/storage/sql/30-schema.sql
Auto-merging sql/upgrades/176.sql
CONFLICT (add/add): Merge conflict in sql/upgrades/176.sql
Patch failed at 0001 add a CVS revision type; to be used with the CVS loader

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 912d04ee8a...

Already up to date.
Changes applied before test
commit 631fd3db1d377f8b277a53d0abb3c6784fd192dd
Author: Stefan Sperling <stsp@stsp.name>
Date:   Tue Jul 13 15:23:10 2021 +0200

    add a CVS revision type; to be used with the CVS loader

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