launchpad-reviewers team mailing list archive

[Colin Watson <mp+431862@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:remove-deprecated-config into launchpad:master.

Commit message:
Remove a number of deprecated configuration items

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/431862

Most of these were removed from Launchpad as part of splitting out `lp-codeimport`; `launchpad.use_gunicorn` was removed entirely.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:remove-deprecated-config into launchpad:master.

diff --git a/configs/development/launchpad-lazr.conf b/configs/development/launchpad-lazr.conf
index c8ca016..97e07c4 100644
--- a/configs/development/launchpad-lazr.conf
+++ b/configs/development/launchpad-lazr.conf
@@ -55,13 +55,6 @@ git_ssh_root: git+ssh://git.launchpad.test/
 loose_objects_threshold: 4350
 packs_threshold: 30
 
-[codeimport]
-bazaar_branch_store: file:///tmp/bazaar-branches
-foreign_tree_store: file:///tmp/foreign-branches
-
-[codeimportdispatcher]
-forced_hostname: bazaar-importer
-
 [database]
 rw_main_primary: dbname=launchpad_dev
 rw_main_standby: dbname=launchpad_dev
diff --git a/lib/lp/services/config/schema-lazr.conf b/lib/lp/services/config/schema-lazr.conf
index a30ee93..cf9c276 100644
--- a/lib/lp/services/config/schema-lazr.conf
+++ b/lib/lp/services/config/schema-lazr.conf
@@ -473,10 +473,6 @@ auto_repack_frequency: 10080
 
 
 [codeimport]
-# Where the Bazaar imports are stored.
-# datatype: string
-bazaar_branch_store: sftp://hoover@escudero/srv/importd/www/
-
 # The default value of the update interval of a code import from
 # Subversion, in seconds.
 # datatype: integer
@@ -497,10 +493,6 @@ default_interval_cvs: 43200
 # datatype: integer
 default_interval_bzr: 21600
 
-# Where the tarballs of foreign branches are uploaded for storage.
-# datatype: string
-foreign_tree_store: sftp://hoover@escudero/srv/importd/sources/
-
 # After how many seconds to kill import workers that show no signs of
 # activity.
 worker_inactivity_timeout: 3600
@@ -519,34 +511,12 @@ svn_revisions_import_limit: 500
 # Deprecated in favour of launchpad.internal_macaroon_secret_key.
 macaroon_secret_key: none
 
-[codeimportdispatcher]
-# The directory where the code import worker should be directed to
-# store its logs.
-worker_log_dir: /var/tmp/codeimport
-
-# Force the dispatcher to look for the code import machine with this
-# hostname, rather than the hostname of the machine it is running on,
-# so we can use a machine name from the sample data on developer
-# machines.
-forced_hostname: none
-
-# Where to find the code import scheduler service.
-codeimportscheduler_url:
-    http://xmlrpc-private.launchpad.test:8087/codeimportscheduler
-
-# The maximum number of jobs to run on a machine at one time.
-max_jobs_per_machine: 3
-
 
 [codeimportworker]
 # This code is used by the code-import-worker-monitor which lives in
 # scripts/code-import-worker-monitor.py and
 # lib/lp/codehosting/codeimport/worker_monitor.py.
 
-# The interval in seconds the worker should wait between updates to the
-# heartbeat field of the CodeImportJob row representing a job.
-heartbeat_update_interval: 30
-
 # The amount of time which can elapse between updating a job's heartbeat
 # field before the job is considered reclaimable.  This is somewhat
 # arbitrarily chosen, but ten times the expected update interval should be
@@ -554,10 +524,6 @@ heartbeat_update_interval: 30
 # the throughput of the system when a job gets stuck for some reason.
 maximum_heartbeat_interval: 300
 
-# The code import worker stores its working files in a directory named
-# worker-for-branch-${BRANCH_ID} in this directory.
-working_directory_root: /var/tmp/codeimport/data
-
 
 [commercial]
 # URL pointing to Ubuntu's licensing policy which Launchpad shares.
@@ -939,11 +905,6 @@ max_scaling: 500
 # Is this server running in dev mode?
 devmode: false
 
-# Should use gunicorn when booting, or fallback to Zope Server?
-# XXX cjwatson 2021-07-16: Pending removal; setting this to false now has no
-# effect.
-use_gunicorn: true
-
 # A directory of files from which *-lazr.conf will be loaded and
 # overlaid in order on top of the main config.
 # Note that this is relative to the top-level config file, not