Details

Reviewers

vlorentz

Group Reviewers

Reviewers

Maniphest Tasks

T3894: Add a 'swh db upgrade' cli

Commits

rDVAUe4c9935c1488: Adapt to swh-core 2.0.0

Summary

add the get_datastore function in swh.vault
add the get_current_version method in VaultBackend,
remove dbversion management from sql init script
update tests accordingly

Depends on D7161
Related to T3894

Diff Detail

Repository

rDVAU Software Heritage Vault

Branch

master

Lint

Lint Skipped

Unit

Unit Tests Skipped

Build Status

Buildable 27112
Build 42401: Phabricator diff pipeline on jenkins	Jenkins console · Jenkins
Build 42400: arc lint + arc unit

Event Timeline

douardda created this revision.Feb 11 2022, 4:39 PM

Herald added a reviewer: Reviewers. · View Herald TranscriptFeb 11 2022, 4:39 PM

Build has FAILED

Patch application report for D7162 (id=25960)

Could not rebase; Attempt merge onto 9d2a46ed06...

Updating 9d2a46e..833dc35
Fast-forward
 swh/vault/__init__.py          |  9 +++++++--
 swh/vault/backend.py           |  2 ++
 swh/vault/sql/30-schema.sql    | 10 ----------
 swh/vault/tests/conftest.py    | 27 +++++++++++++++++++--------
 swh/vault/tests/test_server.py |  2 ++
 5 files changed, 30 insertions(+), 20 deletions(-)

Changes applied before test

commit 833dc351d019efbc1f60f290248aab1978010629
Author: David Douard <david.douard@sdfa3.org>
Date:   Mon Feb 7 13:33:02 2022 +0100

    Adapt to swh-core 2.0.0
    
    - add the `get_datastore` function in `swh.vault`
    - add the `get_current_version` method in `VaultBackend`,
    - remove dbversion management from sql init script
    - update tests accordingly

commit 88bdab84f62d6e106bf26afe8e1e8beff327f2e7
Author: David Douard <david.douard@sdfa3.org>
Date:   Thu Feb 10 19:40:03 2022 +0100

    Ensure the vault instance used in tests is recreated
    
    otherwise XXX

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

Harbormaster returned this revision to the author for changes because remote builds failed.Feb 11 2022, 4:40 PM

Harbormaster failed remote builds in B26836: Diff 25960!

small fix

Build has FAILED

Patch application report for D7162 (id=25962)

Could not rebase; Attempt merge onto 9d2a46ed06...

Updating 9d2a46e..6630472
Fast-forward
 swh/vault/__init__.py          |  9 +++++++--
 swh/vault/backend.py           |  2 ++
 swh/vault/sql/30-schema.sql    | 10 ----------
 swh/vault/tests/conftest.py    | 27 +++++++++++++++++++--------
 swh/vault/tests/test_server.py |  2 ++
 5 files changed, 30 insertions(+), 20 deletions(-)

Changes applied before test

commit 6630472ae79e41a6af1cf557dd5ca5dd4e86108f
Author: David Douard <david.douard@sdfa3.org>
Date:   Mon Feb 7 13:33:02 2022 +0100

    Adapt to swh-core 2.0.0
    
    - add the `get_datastore` function in `swh.vault`
    - add the `get_current_version` method in `VaultBackend`,
    - remove dbversion management from sql init script
    - update tests accordingly

commit 88bdab84f62d6e106bf26afe8e1e8beff327f2e7
Author: David Douard <david.douard@sdfa3.org>
Date:   Thu Feb 10 19:40:03 2022 +0100

    Ensure the vault instance used in tests is recreated
    
    otherwise XXX

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

Harbormaster returned this revision to the author for changes because remote builds failed.Feb 11 2022, 4:44 PM

Harbormaster failed remote builds in B26838: Diff 25962!

forgot to move migration scripts

Build has FAILED

Patch application report for D7162 (id=25965)

Could not rebase; Attempt merge onto 9d2a46ed06...

Updating 9d2a46e..d37b73b
Fast-forward
 swh/vault/__init__.py                   |  9 +++++++--
 swh/vault/backend.py                    |  2 ++
 swh/vault/sql/30-schema.sql             | 10 ----------
 {sql => swh/vault/sql}/upgrades/002.sql |  0
 {sql => swh/vault/sql}/upgrades/003.sql |  0
 swh/vault/tests/conftest.py             | 27 +++++++++++++++++++--------
 swh/vault/tests/test_server.py          |  2 ++
 7 files changed, 30 insertions(+), 20 deletions(-)
 rename {sql => swh/vault/sql}/upgrades/002.sql (100%)
 rename {sql => swh/vault/sql}/upgrades/003.sql (100%)

Changes applied before test

commit d37b73b12128408234dabdcb170e379bab0feeb6
Author: David Douard <david.douard@sdfa3.org>
Date:   Mon Feb 7 13:33:02 2022 +0100

    Adapt to swh-core 2.0.0
    
    - add the `get_datastore` function in `swh.vault`
    - add the `get_current_version` method in `VaultBackend`,
    - remove dbversion management from sql init script
    - update tests accordingly

commit 88bdab84f62d6e106bf26afe8e1e8beff327f2e7
Author: David Douard <david.douard@sdfa3.org>
Date:   Thu Feb 10 19:40:03 2022 +0100

    Ensure the vault instance used in tests is recreated
    
    otherwise XXX

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

Harbormaster returned this revision to the author for changes because remote builds failed.Feb 11 2022, 4:56 PM

Harbormaster failed remote builds in B26841: Diff 25965!

douardda added a parent revision: D7155: Refactor swh.core.db.pytest_plugin.Feb 11 2022, 5:11 PM

douardda retitled this revision from Adapt to swh-core 2.0.0 to Adapt vault to swh-core 2.0.0.

rebase

Build has FAILED

Patch application report for D7162 (id=25977)

Could not rebase; Attempt merge onto 9d2a46ed06...

Updating 9d2a46e..2e41370
Fast-forward
 swh/vault/__init__.py                   |  9 +++++++--
 swh/vault/backend.py                    |  2 ++
 swh/vault/sql/30-schema.sql             | 10 ----------
 {sql => swh/vault/sql}/upgrades/002.sql |  0
 {sql => swh/vault/sql}/upgrades/003.sql |  0
 swh/vault/tests/conftest.py             | 27 +++++++++++++++++++--------
 swh/vault/tests/test_server.py          |  4 ++++
 7 files changed, 32 insertions(+), 20 deletions(-)
 rename {sql => swh/vault/sql}/upgrades/002.sql (100%)
 rename {sql => swh/vault/sql}/upgrades/003.sql (100%)

Changes applied before test

commit 2e41370329c12dcc382a95b528b19f473478e4ef
Author: David Douard <david.douard@sdfa3.org>
Date:   Mon Feb 7 13:33:02 2022 +0100

    Adapt to swh-core 2.0.0
    
    - add the `get_datastore` function in `swh.vault`
    - add the `get_current_version` method in `VaultBackend`,
    - remove dbversion management from sql init script
    - update tests accordingly

commit dccc245a01aef621a7439dc392f56a5a646c4764
Author: David Douard <david.douard@sdfa3.org>
Date:   Thu Feb 10 19:40:03 2022 +0100

    Ensure the vault instance used in tests is recreated
    
    otherwise XXX

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

Harbormaster returned this revision to the author for changes because remote builds failed.Feb 14 2022, 12:19 PM

Harbormaster failed remote builds in B26851: Diff 25977!

Build is green

Patch application report for D7162 (id=25977)

Rebasing onto dccc245a01...

Current branch diff-target is up to date.

Changes applied before test

commit 2e41370329c12dcc382a95b528b19f473478e4ef
Author: David Douard <david.douard@sdfa3.org>
Date:   Mon Feb 7 13:33:02 2022 +0100

    Adapt to swh-core 2.0.0
    
    - add the `get_datastore` function in `swh.vault`
    - add the `get_current_version` method in `VaultBackend`,
    - remove dbversion management from sql init script
    - update tests accordingly

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

Harbormaster completed remote builds in B26851: Diff 25977.Feb 23 2022, 11:30 AM

douardda requested review of this revision.Feb 23 2022, 11:30 AM

vlorentz accepted this revision.Feb 23 2022, 11:37 AM

This revision is now accepted and ready to land.Feb 23 2022, 11:37 AM

ardumont added a subscriber: ardumont.Feb 23 2022, 11:45 AM

ardumont added inline comments.

swh/vault/backend.py
70	So now, we only have to migrate that version number when migrating pg schema, right?

douardda added inline comments.Feb 24 2022, 11:15 AM

swh/vault/backend.py
70	So now, we only have to migrate that version number when migrating pg schema, right? yes (and add a nnn.sql migration script).

bump dependency to swh.core 2

Build has FAILED

Patch application report for D7162 (id=26240)

Rebasing onto dccc245a01...

Current branch diff-target is up to date.

Changes applied before test

commit e4c9935c14889ee5fce387dfa6956c047c418b2d
Author: David Douard <david.douard@sdfa3.org>
Date:   Mon Feb 7 13:33:02 2022 +0100

    Adapt to swh-core 2.0.0
    
    - add the `get_datastore` function in `swh.vault`
    - add the `get_current_version` method in `VaultBackend`,
    - remove dbversion management from sql init script
    - update tests accordingly

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

Harbormaster failed remote builds in B27112: Diff 26240!Feb 24 2022, 11:24 AM

Build is green

Patch application report for D7162 (id=26240)

Rebasing onto dccc245a01...

Current branch diff-target is up to date.

Changes applied before test

commit e4c9935c14889ee5fce387dfa6956c047c418b2d
Author: David Douard <david.douard@sdfa3.org>
Date:   Mon Feb 7 13:33:02 2022 +0100

    Adapt to swh-core 2.0.0
    
    - add the `get_datastore` function in `swh.vault`
    - add the `get_current_version` method in `VaultBackend`,
    - remove dbversion management from sql init script
    - update tests accordingly

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

Build is green

Patch application report for D7162 (id=26240)

Rebasing onto dccc245a01...

Current branch diff-target is up to date.

Changes applied before test

commit e4c9935c14889ee5fce387dfa6956c047c418b2d
Author: David Douard <david.douard@sdfa3.org>
Date:   Mon Feb 7 13:33:02 2022 +0100

    Adapt to swh-core 2.0.0
    
    - add the `get_datastore` function in `swh.vault`
    - add the `get_current_version` method in `VaultBackend`,
    - remove dbversion management from sql init script
    - update tests accordingly

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

Harbormaster completed remote builds in B27112: Diff 26240.Feb 24 2022, 11:33 AM

Closed by commit rDVAUe4c9935c1488: Adapt to swh-core 2.0.0 (authored by douardda). · Explain WhyFeb 24 2022, 5:15 PM

This revision was automatically updated to reflect the committed changes.

douardda added a commit: rDVAUe4c9935c1488: Adapt to swh-core 2.0.0.

Adapt vault to swh-core 2.0.0
ClosedPublic
Actions

Details

Diff Detail

Event Timeline

Patch application report for D7162 (id=25960)

Changes applied before test

Patch application report for D7162 (id=25962)

Changes applied before test

Patch application report for D7162 (id=25965)

Changes applied before test

Patch application report for D7162 (id=25977)

Changes applied before test

Patch application report for D7162 (id=25977)

Changes applied before test

Patch application report for D7162 (id=26240)

Changes applied before test

Patch application report for D7162 (id=26240)

Changes applied before test

Patch application report for D7162 (id=26240)

Changes applied before test

Revision Contents
Changeset List

Diff 26240

requirements-swh.txt

sql/upgrades/002.sql

sql/upgrades/003.sql

swh/vault/init.py

swh/vault/backend.py

swh/vault/sql/30-schema.sql

swh/vault/sql/upgrades/002.sql

swh/vault/sql/upgrades/003.sql

swh/vault/tests/conftest.py

Adapt vault to swh-core 2.0.0ClosedPublicActions

Details

Diff Detail

Event Timeline

Patch application report for D7162 (id=25960)

Changes applied before test

Patch application report for D7162 (id=25962)

Changes applied before test

Patch application report for D7162 (id=25965)

Changes applied before test

Patch application report for D7162 (id=25977)

Changes applied before test

Patch application report for D7162 (id=25977)

Changes applied before test

Patch application report for D7162 (id=26240)

Changes applied before test

Patch application report for D7162 (id=26240)

Changes applied before test

Patch application report for D7162 (id=26240)

Changes applied before test

Revision ContentsChangeset List

Diff 26240

requirements-swh.txt

sql/upgrades/002.sql

sql/upgrades/003.sql

swh/vault/__init__.py

swh/vault/backend.py

swh/vault/sql/30-schema.sql

swh/vault/sql/upgrades/002.sql

swh/vault/sql/upgrades/003.sql

swh/vault/tests/conftest.py

Adapt vault to swh-core 2.0.0
ClosedPublic
Actions

Revision Contents
Changeset List

swh/vault/init.py