diff --git a/data/common/common.yaml b/data/common/common.yaml --- a/data/common/common.yaml +++ b/data/common/common.yaml @@ -2398,6 +2398,19 @@ # high priority loader (save-code-now, ...) swh::deploy::worker::loader_high_priority::config_file: "%{hiera('swh::conf_directory')}/loader_high_priority.yml" +swh::deploy::worker::loader_high_priority::queues: + # git + - save_code_now:swh.loader.git.tasks.UpdateGitRepository + # mercurial + - save_code_now:swh.loader.mercurial.tasks.LoadMercurial + - save_code_now:swh.loader.mercurial.tasks.LoadArchiveMercurial + # svn + - save_code_now:swh.loader.svn.tasks.LoadSvnRepository + - save_code_now:swh.loader.svn.tasks.MountAndLoadSvnRepository + - save_code_now:swh.loader.svn.tasks.DumpMountAndLoadSvnRepository + # archives + - save_code_now:swh.loader.package.archive.tasks.LoadArchive + swh::deploy::worker::loader_high_priority::concurrency: 1 swh::deploy::worker::loader_high_priority::max_tasks_per_child: 1 swh::deploy::worker::loader_high_priority::loglevel: info @@ -2408,17 +2421,7 @@ task_acks_late: true task_broker: "%{alias('swh::deploy::worker::task_broker')}" task_queues: - # git - - save_code_now:swh.loader.git.tasks.UpdateGitRepository - # mercurial - - save_code_now:swh.loader.mercurial.tasks.LoadMercurial - - save_code_now:swh.loader.mercurial.tasks.LoadArchiveMercurial - # svn - - save_code_now:swh.loader.svn.tasks.LoadSvnRepository - - save_code_now:swh.loader.svn.tasks.MountAndLoadSvnRepository - - save_code_now:swh.loader.svn.tasks.DumpMountAndLoadSvnRepository - # archives - - save_code_now:swh.loader.package.archive.tasks.LoadArchive + "%{alias('swh::deploy::worker::loader_high_priority::queues')}" # One shot worker deactivated by default (e.g. first time ingestion on forge with # restrictive loading ingestion parallelism policies) @@ -2463,6 +2466,22 @@ task_queues: - swh.loader.package.archive.tasks.LoadArchive +swh::deploy::loader_bzr::sentry_swh_package: swh.loader.bzr +swh::deploy::loader_bzr::sentry_environment: "%{alias('swh::deploy::environment')}" +swh::deploy::loader_bzr::sentry_dsn: "https://%{lookup('swh::deploy::loader_bzr::sentry_token')}@sentry.softwareheritage.org/22" +swh::deploy::worker::loader_bzr::config_file: "%{hiera('swh::conf_directory')}/loader_bzr.yml" +swh::deploy::worker::loader_bzr::concurrency: 1 +swh::deploy::worker::loader_bzr::private_tmp: true +swh::deploy::worker::loader_bzr::loglevel: info +swh::deploy::worker::loader_bzr::config: + storage: "%{alias('swh::deploy::worker::storage::pipeline')}" + max_content_size: "%{alias('swh::deploy::worker::loader::max_content_size')}" + clone_timeout_seconds: 7200 + celery: + task_broker: "%{alias('swh::deploy::worker::task_broker')}" + task_queues: + - swh.loader.bzr.tasks.LoadBazaar + swh::deploy::worker::loader_cran::config_file: "%{hiera('swh::conf_directory')}/loader_cran.yml" swh::deploy::worker::loader_cran::private_tmp: true swh::deploy::worker::loader_cran::concurrency: 1 diff --git a/data/deployments/staging/common.yaml b/data/deployments/staging/common.yaml --- a/data/deployments/staging/common.yaml +++ b/data/deployments/staging/common.yaml @@ -33,6 +33,7 @@ swh::deploy::worker::instances: - checker_deposit - loader_archive + - loader_bzr - loader_cran - loader_cvs - loader_debian @@ -298,3 +299,19 @@ uri: '/browse/snapshot/48dcf76ec1a3bd57ec117b1dace633691fdfd70d/branches/' regexp: - 'refs/tags/syslinux-3.20-pre2.*refs/tags/syslinux-3.20-pre3.*' + +swh::deploy::worker::loader_high_priority::queues: + # bzr + - save_code_now:swh.loader.bzr.tasks.LoadBazaar + # git + - save_code_now:swh.loader.git.tasks.UpdateGitRepository + # mercurial + - save_code_now:swh.loader.mercurial.tasks.LoadMercurial + - save_code_now:swh.loader.mercurial.tasks.LoadArchiveMercurial + # svn + - save_code_now:swh.loader.svn.tasks.LoadSvnRepository + - save_code_now:swh.loader.svn.tasks.MountAndLoadSvnRepository + - save_code_now:swh.loader.svn.tasks.DumpMountAndLoadSvnRepository + # archives + - save_code_now:swh.loader.package.archive.tasks.LoadArchive + diff --git a/site-modules/profile/manifests/swh/deploy/worker/loader_bzr.pp b/site-modules/profile/manifests/swh/deploy/worker/loader_bzr.pp new file mode 100644 --- /dev/null +++ b/site-modules/profile/manifests/swh/deploy/worker/loader_bzr.pp @@ -0,0 +1,19 @@ +# Deployment for swh-loader-bzr +class profile::swh::deploy::worker::loader_bzr { + include ::profile::swh::deploy::loader + + $packages = ['python3-swh.loader.bzr'] + $private_tmp = lookup('swh::deploy::worker::loader_bzr::private_tmp') + + package {$packages: + ensure => 'present', + } + + ::profile::swh::deploy::worker::instance {'loader_bzr': + ensure => 'present', + private_tmp => $private_tmp, + require => [ + Package[$packages], + ], + } +}