This just explicits what used to be set by default in the deposit regarding the provider.
Information which is transited to the deposit loader.
Details
Details
- Reviewers
- None
- Group Reviewers
Reviewers - Commits
- rSPSITEc3e76ffac4bb: conf/deposit: Explicit api configuration
octocatalog
bin/octocatalog-diff --octocatalog-diff-args --no-truncate-details --to staging deposit.internal.staging.swh.network
Found host deposit.internal.staging.swh.network
Cloning into '/tmp/swh-ocd.BasCM0H9/environments/production/data/private'...
done.
Cloning into '/tmp/swh-ocd.BasCM0H9/environments/staging/data/private'...
done.
*** Running octocatalog-diff on host deposit.internal.staging.swh.network
I, [2020-09-16T18:47:00.767738 #3745] INFO -- : Catalogs compiled for deposit.internal.staging.swh.network
I, [2020-09-16T18:47:03.118164 #3745] INFO -- : Diffs computed for deposit.internal.staging.swh.network
diff origin/production/deposit.internal.staging.swh.network current/deposit.internal.staging.swh.network
*******************************************
File[/etc/softwareheritage/deposit/server.yml] =>
parameters =>
content =>
@@ -6,4 +6,7 @@
configuration:
sword_version: 2
+provider:
+ provider_type: deposit_client
+ metadata: {}
scheduler:
cls: remote
*******************************************
*** End octocatalog-diff on deposit.internal.staging.swh.networkDiff Detail
Diff Detail
- Repository
- rSPSITE puppet-swh-site
- Branch
- staging
- Lint
No Linters Available - Unit
No Unit Test Coverage - Build Status
Buildable 15295 Build 23554: arc lint + arc unit
Event Timeline
| data/defaults.yaml | ||
|---|---|---|
| 1678 | yes, I completely agree. But there was some opposition when I suggested doing that for indexer tools, so I didn't mention it. Though now I checked the reason, and it was only for external tools, not SWH modules. https://forge.softwareheritage.org/T1464#26934 And we're already doing auto-detection in loaders, anyway | |
Comment Actions
I just grepped through swh-deposit, and I can't find where this provider dict is used, other than in the config declaration. Do we really need it?
| data/defaults.yaml | ||
|---|---|---|
| 1678 | Thanks for confirming this and the link ;) I'll check on how to properly do that deposit side. | |
Comment Actions
I just grepped through swh-deposit, and I can't find where this provider dict is used, other than in the config declaration. Do we really need it?
Yes [1]
You did not find it because it so happens it just has been removed from the "implicit" configuration loading [2]
I'm trying to improve on that... albeit slowly.
Comment Actions
Build is green
Patch application report for D3969 (id=14022)
Rebasing onto 28d61c8cf1...
Current branch diff-target is up to date.
Changes applied before test
commit 4658518084d4bbe769afcdcf87290f03319a5fe9
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date: Wed Sep 16 15:25:52 2020 +0200
swh.core.config: Simplify SWHConfig mixin to its actual use
Related to T1532See https://jenkins.softwareheritage.org/job/DCORE/job/tests-on-diff/61/ for more details.