Skip to content

web: Configure instance_name configuration key per webapp instance

Antoine R. Dumont requested to merge generated-differential-D5874-source into generated-differential-D5874-target

This allows to build properly the same instance of lister for the routine which schedules successful save code now origins (in the scheduler).

Related to T1524 Related to D5873 (for docker)

Test Plan

$ bin/octocatalog-diff --to staging webapp1
*** Running octocatalog-diff on host webapp1.internal.softwareheritage.org
I, [2021-06-15T16:06:23.506008 #25847]  INFO -- : Catalogs compiled for webapp1.internal.softwareheritage.org
I, [2021-06-15T16:06:25.461234 #25847]  INFO -- : Diffs computed for webapp1.internal.softwareheritage.org
diff origin/production/webapp1.internal.softwareheritage.org current/webapp1.internal.softwareheritage.org
*******************************************
  File[/etc/softwareheritage/web/web.yml] =>
   parameters =>
     content =>
      @@ -86,4 +86,5 @@
         realm_name: SoftwareHeritage
       history_counters_url: http://counters1.internal.softwareheritage.org:5011/counters_history/history.json
      +instance_name: archive.softwareheritage.org
       allowed_hosts:
       - webapp1.internal.softwareheritage.org
*******************************************
*** End octocatalog-diff on webapp1.internal.softwareheritage.org

$ bin/octocatalog-diff --to staging moma
*** Running octocatalog-diff on host moma.softwareheritage.org
I, [2021-06-15T16:05:39.937513 #17895]  INFO -- : Catalogs compiled for moma.softwareheritage.org
I, [2021-06-15T16:05:42.027450 #17895]  INFO -- : Diffs computed for moma.softwareheritage.org
diff origin/production/moma.softwareheritage.org current/moma.softwareheritage.org
*******************************************
  File[/etc/softwareheritage/web/web.yml] =>
   parameters =>
     content =>
      @@ -86,4 +86,5 @@
         realm_name: SoftwareHeritage
       history_counters_url: http://counters1.internal.softwareheritage.org:5011/counters_history/history.json
      +instance_name: archive.softwareheritage.org
       allowed_hosts:
       - archive.softwareheritage.org
*******************************************
*** End octocatalog-diff on moma.softwareheritage.org

$ bin/octocatalog-diff --to staging webapp.internal.staging.swh.network
*** Running octocatalog-diff on host webapp.internal.staging.swh.network
I, [2021-06-15T16:05:25.429525 #12338]  INFO -- : Catalogs compiled for webapp.internal.staging.swh.network
I, [2021-06-15T16:05:27.362212 #12338]  INFO -- : Diffs computed for webapp.internal.staging.swh.network
diff origin/production/webapp.internal.staging.swh.network current/webapp.internal.staging.swh.network
*******************************************
  File[/etc/softwareheritage/web/web.yml] =>
   parameters =>
     content =>
      @@ -79,4 +79,5 @@
         realm_name: SoftwareHeritageStaging
       history_counters_url: http://counters0.internal.staging.swh.network:5011/counters_history/history.json
      +instance_name: webapp.staging.swh.network
       allowed_hosts:
       - webapp.staging.swh.network
*******************************************
*** End octocatalog-diff on webapp.internal.staging.swh.network

Migrated from D5874 (view on Phabricator)

Merge request reports