diff options
| author | Ben Hutchings <ben.hutchings@codethink.co.uk> | 2020-05-06 22:45:42 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben.hutchings@codethink.co.uk> | 2020-06-01 15:26:47 +0100 |
| commit | 14eac038d2fa7ac4845135a827ca8c2f2bab559c (patch) | |
| tree | 516737a7c9f8bc176fee1f5e3b4ec4dd28ce9550 /lorrycontroller/givemejob.py | |
| parent | 5963f66a434d49a4a6e8dfc02cfe256c88d1e1e6 (diff) | |
| download | lorry-controller-14eac038d2fa7ac4845135a827ca8c2f2bab559c.tar.gz | |
Update terminology for hosts in internal APIs and web templates
This is intended to replace all uses of "Trove" that should really be
"Downstream Host" or "Upstream Host", except in the database schema
and the REST API (which will probably change later).
* ARCH: Update example code to reflect API name change
* yarns.webapp: Update test descriptions and uses of internal APIs
* units: Update and rename the ls-troves units (although they still
use the ls-troves endpoint for now)
Some references that really are specific to Trove integration are
retained.
Related to #3.
Diffstat (limited to 'lorrycontroller/givemejob.py')
| -rw-r--r-- | lorrycontroller/givemejob.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lorrycontroller/givemejob.py b/lorrycontroller/givemejob.py index a893036..9d4d4d2 100644 --- a/lorrycontroller/givemejob.py +++ b/lorrycontroller/givemejob.py @@ -37,7 +37,7 @@ class GiveMeJob(lorrycontroller.LorryControllerRoute): for lorry_info in lorry_infos: if self.ready_to_run(lorry_info, now): self.create_repository(statedb, lorry_info) - if lorry_info['from_trovehost']: + if lorry_info['from_host']: self.copy_repository_metadata(statedb, lorry_info) self.give_job_to_minion(statedb, lorry_info, now) logging.info( @@ -120,14 +120,14 @@ class GiveMeJob(lorrycontroller.LorryControllerRoute): def copy_repository_metadata(self, statedb, lorry_info): '''Copy project.head and project.description to the local Trove.''' - assert lorry_info['from_trovehost'] + assert lorry_info['from_host'] assert lorry_info['from_path'] if self.app_settings['git-server-type'] != 'gitano': # FIXME: would be good to have this info in Gerrit too return - remote = lorrycontroller.new_gitano_command(statedb, lorry_info['from_trovehost']) + remote = lorrycontroller.new_gitano_command(statedb, lorry_info['from_host']) local = lorrycontroller.LocalTroveGitanoCommand() try: @@ -142,7 +142,7 @@ class GiveMeJob(lorrycontroller.LorryControllerRoute): if not local_config['project.description']: desc = '{host}: {desc}'.format( - host=lorry_info['from_trovehost'], + host=lorry_info['from_host'], desc=remote_config['project.description']) local.set_gitano_config( lorry_info['path'], |