Fix and unify end-to-end checks for deposit, webapp and vault

The vault ones are probably working because they did not rely on the lookup which could not work (as explained in the associated issue).

The rest is fixed [1]

octo diff [1]

swh-octo-diff pergamon 2>&1 | colordiff
+ /home/tony/work/inria/repo/swh/puppet-environment/bin/octocatalog-diff --to mr/fix-end-to-end-parametric-checks pergamon
Found host pergamon.softwareheritage.org
Cloning into '/tmp/swh-ocd.3rkoRR4T/swh-site'...
done.
Switched to a new branch 'mr/fix-end-to-end-parametric-checks'
branch 'mr/fix-end-to-end-parametric-checks' set up to track 'origin/mr/fix-end-to-end-parametric-checks'.
+ /usr/bin/r10k deploy environment -c /tmp/swh-ocd.3rkoRR4T/r10k.yaml --puppetfile production mr/fix-end-to-end-parametric-checks
WARN     -> Environment "mr/fix-end-to-end-parametric-checks" contained non-word characters, correcting name to mr_fix_end_to_end_parametric_checks
WARN     -> Environment "mr/fix-end-to-end-parametric-checks" contained non-word characters, correcting name to mr_fix_end_to_end_parametric_checks
Cloning into '/tmp/swh-ocd.3rkoRR4T/environments/production/data/private'...
done.
Cloning into '/tmp/swh-ocd.3rkoRR4T/environments/mr_fix_end_to_end_parametric_checks/data/private'...
done.
*** Running octocatalog-diff on host pergamon.softwareheritage.org
+ /usr/bin/octocatalog-diff --bootstrapped-from-dir /tmp/swh-ocd.3rkoRR4T/environments/production --bootstrapped-to-dir /tmp/swh-ocd.3rkoRR4T/environments/mr_fix_end_to_end_parametric_checks --fact-file /home/tony/work/inria/repo/swh/puppet-environment/octocatalog-diff/facts/pergamon.softwareheritage.org.json -n pergamon.softwareheritage.org --display-detail-add
I, [2025-03-11T17:07:35.421401 #2698241]  INFO -- : Catalogs compiled for pergamon.softwareheritage.org
W, [2025-03-11T17:07:36.398109 #2698241]  WARN -- : Resource File[/tmp/ocd-ipc-20250311-2698241-4m1zt9/ocd-builddir-20250311-2698243-2h82pp/routes.yaml] appears to depend on catalog compilation directory. Suppressed from results.
W, [2025-03-11T17:07:36.398182 #2698241]  WARN -- : Resource File[/tmp/ocd-ipc-20250311-2698241-4m1zt9/ocd-builddir-20250311-2698242-2h82pp/routes.yaml] appears to depend on catalog compilation directory. Suppressed from results.
W, [2025-03-11T17:07:36.398371 #2698241]  WARN -- : Resource key Ini_setting[puppetdbserver_urls] parameters => path may depend on catalog compilation directory, but there may be differences. This is included in results for now, but please verify.
W, [2025-03-11T17:07:36.398379 #2698241]  WARN -- : Resource key Ini_setting[puppetdbserver_urls] parameters => path appears to depend on catalog compilation directory. Suppressed from results.
W, [2025-03-11T17:07:36.398397 #2698241]  WARN -- : Resource key Ini_setting[soft_write_failure] parameters => path may depend on catalog compilation directory, but there may be differences. This is included in results for now, but please verify.
W, [2025-03-11T17:07:36.398402 #2698241]  WARN -- : Resource key Ini_setting[soft_write_failure] parameters => path appears to depend on catalog compilation directory. Suppressed from results.
I, [2025-03-11T17:07:36.399125 #2698241]  INFO -- : Diffs computed for pergamon.softwareheritage.org
diff origin/production/pergamon.softwareheritage.org current/pergamon.softwareheritage.org
*******************************************
  Concat::Fragment[icinga2::object::CheckCommand::staging-check-deposit-cmd] =>
   parameters =>
     content =>
      @@ -3,5 +3,5 @@
         import "plugin-check-command"
      _
      -  command = [ "/opt/swh-e2e-checks/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "staging", "--warning", 600, "--critical", 3600, "check-deposit", "--server", "https://deposit.softwareheritage.org/1", "--username", "swh", "--password", "swh-deploy-deposit-e2e-password", "--collection", "swh", "--provider-url", "https://www.softwareheritage.org", "--swh-web-url", "https://archive.softwareheritage.org", "--poll-interval", 1, "single", "--archive", "/opt/swh-e2e-checks/lib/python3.11/site-packages/swh/icinga_plugins/data/deposit/jesuisgpl.tgz", "--metadata", "/opt/swh-e2e-checks/lib/python3.11/site-packages/swh/icinga_plugins/data/deposit/jesuisgpl.tgz.xml", ]
      +  command = [ "/opt/swh-e2e-checks/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "staging", "--warning", 600, "--critical", 3600, "check-deposit", "--server", "https://deposit.staging.swh.network/1", "--username", "swh", "--password", "swh-deploy-deposit-e2e-password", "--collection", "swh", "--provider-url", "https://www.softwareheritage.org", "--swh-web-url", "https://archive.softwareheritage.org", "--poll-interval", 1, "single", "--archive", "/opt/swh-e2e-checks/lib/python3.11/site-packages/swh/icinga_plugins/data/deposit/jesuisgpl.tgz", "--metadata", "/opt/swh-e2e-checks/lib/python3.11/site-packages/swh/icinga_plugins/data/deposit/jesuisgpl.tgz.xml", ]
         timeout = 4800
       }
*******************************************
  Concat::Fragment[icinga2::object::CheckCommand::staging-check-savecodenow-cmd-git-git] =>
   parameters =>
     content =>
      @@ -3,5 +3,5 @@
         import "plugin-check-command"
      _
      -  command = [ "/opt/swh-e2e-checks/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "staging", "--warning", 300, "--critical", 600, "check-savecodenow", "--swh-web-url", "https://archive.softwareheritage.org", "origin", "https://github.com/rdicosmo/parmap", "https://github.com/SoftwareHeritage/swh-core", "https://github.com/SoftwareHeritage/swh-lister", "https://github.com/SoftwareHeritage/swh-loader-bzr", "https://github.com/SoftwareHeritage/swh-loader-core", "https://github.com/SoftwareHeritage/swh-loader-git", "https://github.com/SoftwareHeritage/swh-loader-mercurial", "https://github.com/SoftwareHeritage/swh-loader-svn", "https://github.com/SoftwareHeritage/swh-model", "https://github.com/SoftwareHeritage/swh-web", "--visit-type", "git", ]
      +  command = [ "/opt/swh-e2e-checks/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "staging", "--warning", 300, "--critical", 600, "check-savecodenow", "--swh-web-url", "https://webapp.staging.swh.network", "origin", "https://github.com/rdicosmo/parmap", "https://github.com/SoftwareHeritage/swh-core", "https://github.com/SoftwareHeritage/swh-lister", "https://github.com/SoftwareHeritage/swh-loader-bzr", "https://github.com/SoftwareHeritage/swh-loader-core", "https://github.com/SoftwareHeritage/swh-loader-git", "https://github.com/SoftwareHeritage/swh-loader-mercurial", "https://github.com/SoftwareHeritage/swh-loader-svn", "https://github.com/SoftwareHeritage/swh-model", "https://github.com/SoftwareHeritage/swh-web", "--visit-type", "git", ]
         timeout = 900
       }
*******************************************
  Concat::Fragment[icinga2::object::CheckCommand::staging-check-savecodenow-cmd-mercurial-hg] =>
   parameters =>
     content =>
      @@ -3,5 +3,5 @@
         import "plugin-check-command"
      _
      -  command = [ "/opt/swh-e2e-checks/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "staging", "--warning", 300, "--critical", 600, "check-savecodenow", "--swh-web-url", "https://archive.softwareheritage.org", "origin", "https://foss.heptapod.net/mercurial/hgview", "https://foss.heptapod.net/mercurial/tortoisehg", "https://foss.heptapod.net/mercurial/evolve", "https://foss.heptapod.net/mercurial/hg-git", "https://foss.heptapod.net/mercurial/hg-docgraph", "https://foss.heptapod.net/mercurial/mercurial-devel", "https://foss.heptapod.net/mercurial/pytest", "https://foss.heptapod.net/mercurial/scmperf", "--visit-type", "hg", ]
      +  command = [ "/opt/swh-e2e-checks/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "staging", "--warning", 300, "--critical", 600, "check-savecodenow", "--swh-web-url", "https://webapp.staging.swh.network", "origin", "https://foss.heptapod.net/mercurial/hgview", "https://foss.heptapod.net/mercurial/tortoisehg", "https://foss.heptapod.net/mercurial/evolve", "https://foss.heptapod.net/mercurial/hg-git", "https://foss.heptapod.net/mercurial/hg-docgraph", "https://foss.heptapod.net/mercurial/mercurial-devel", "https://foss.heptapod.net/mercurial/pytest", "https://foss.heptapod.net/mercurial/scmperf", "--visit-type", "hg", ]
         timeout = 900
       }
*******************************************
  Concat::Fragment[icinga2::object::CheckCommand::staging-check-savecodenow-cmd-subversion-svn] =>
   parameters =>
     content =>
      @@ -3,5 +3,5 @@
         import "plugin-check-command"
      _
      -  command = [ "/opt/swh-e2e-checks/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "staging", "--warning", 300, "--critical", 600, "check-savecodenow", "--swh-web-url", "https://archive.softwareheritage.org", "origin", "https://subversion.renater.fr/anonscm/svn/panda", "https://svn.code.sf.net/p/freeorion/code", "https://svn.code.sf.net/p/swig/code", "https://svn.code.sf.net/p/zookeeper/code", "https://svn.code.sf.net/p/esitools/code", "https://svn.code.sf.net/p/sauerbraten/code/", "https://svn.code.sf.net/p/civ4mods/code", "https://svn.code.sf.net/p/ldap-sdk/code", "--visit-type", "svn", ]
      +  command = [ "/opt/swh-e2e-checks/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "staging", "--warning", 300, "--critical", 600, "check-savecodenow", "--swh-web-url", "https://webapp.staging.swh.network", "origin", "https://subversion.renater.fr/anonscm/svn/panda", "https://svn.code.sf.net/p/freeorion/code", "https://svn.code.sf.net/p/swig/code", "https://svn.code.sf.net/p/zookeeper/code", "https://svn.code.sf.net/p/esitools/code", "https://svn.code.sf.net/p/sauerbraten/code/", "https://svn.code.sf.net/p/civ4mods/code", "https://svn.code.sf.net/p/ldap-sdk/code", "--visit-type", "svn", ]
         timeout = 900
       }
*******************************************
  Concat_fragment[icinga2::object::CheckCommand::staging-check-deposit-cmd] =>
   parameters =>
     content =>
      @@ -3,5 +3,5 @@
         import "plugin-check-command"
      _
      -  command = [ "/opt/swh-e2e-checks/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "staging", "--warning", 600, "--critical", 3600, "check-deposit", "--server", "https://deposit.softwareheritage.org/1", "--username", "swh", "--password", "swh-deploy-deposit-e2e-password", "--collection", "swh", "--provider-url", "https://www.softwareheritage.org", "--swh-web-url", "https://archive.softwareheritage.org", "--poll-interval", 1, "single", "--archive", "/opt/swh-e2e-checks/lib/python3.11/site-packages/swh/icinga_plugins/data/deposit/jesuisgpl.tgz", "--metadata", "/opt/swh-e2e-checks/lib/python3.11/site-packages/swh/icinga_plugins/data/deposit/jesuisgpl.tgz.xml", ]
      +  command = [ "/opt/swh-e2e-checks/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "staging", "--warning", 600, "--critical", 3600, "check-deposit", "--server", "https://deposit.staging.swh.network/1", "--username", "swh", "--password", "swh-deploy-deposit-e2e-password", "--collection", "swh", "--provider-url", "https://www.softwareheritage.org", "--swh-web-url", "https://archive.softwareheritage.org", "--poll-interval", 1, "single", "--archive", "/opt/swh-e2e-checks/lib/python3.11/site-packages/swh/icinga_plugins/data/deposit/jesuisgpl.tgz", "--metadata", "/opt/swh-e2e-checks/lib/python3.11/site-packages/swh/icinga_plugins/data/deposit/jesuisgpl.tgz.xml", ]
         timeout = 4800
       }
*******************************************
  Concat_fragment[icinga2::object::CheckCommand::staging-check-savecodenow-cmd-git-git] =>
   parameters =>
     content =>
      @@ -3,5 +3,5 @@
         import "plugin-check-command"
      _
      -  command = [ "/opt/swh-e2e-checks/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "staging", "--warning", 300, "--critical", 600, "check-savecodenow", "--swh-web-url", "https://archive.softwareheritage.org", "origin", "https://github.com/rdicosmo/parmap", "https://github.com/SoftwareHeritage/swh-core", "https://github.com/SoftwareHeritage/swh-lister", "https://github.com/SoftwareHeritage/swh-loader-bzr", "https://github.com/SoftwareHeritage/swh-loader-core", "https://github.com/SoftwareHeritage/swh-loader-git", "https://github.com/SoftwareHeritage/swh-loader-mercurial", "https://github.com/SoftwareHeritage/swh-loader-svn", "https://github.com/SoftwareHeritage/swh-model", "https://github.com/SoftwareHeritage/swh-web", "--visit-type", "git", ]
      +  command = [ "/opt/swh-e2e-checks/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "staging", "--warning", 300, "--critical", 600, "check-savecodenow", "--swh-web-url", "https://webapp.staging.swh.network", "origin", "https://github.com/rdicosmo/parmap", "https://github.com/SoftwareHeritage/swh-core", "https://github.com/SoftwareHeritage/swh-lister", "https://github.com/SoftwareHeritage/swh-loader-bzr", "https://github.com/SoftwareHeritage/swh-loader-core", "https://github.com/SoftwareHeritage/swh-loader-git", "https://github.com/SoftwareHeritage/swh-loader-mercurial", "https://github.com/SoftwareHeritage/swh-loader-svn", "https://github.com/SoftwareHeritage/swh-model", "https://github.com/SoftwareHeritage/swh-web", "--visit-type", "git", ]
         timeout = 900
       }
*******************************************
  Concat_fragment[icinga2::object::CheckCommand::staging-check-savecodenow-cmd-mercurial-hg] =>
   parameters =>
     content =>
      @@ -3,5 +3,5 @@
         import "plugin-check-command"
      _
      -  command = [ "/opt/swh-e2e-checks/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "staging", "--warning", 300, "--critical", 600, "check-savecodenow", "--swh-web-url", "https://archive.softwareheritage.org", "origin", "https://foss.heptapod.net/mercurial/hgview", "https://foss.heptapod.net/mercurial/tortoisehg", "https://foss.heptapod.net/mercurial/evolve", "https://foss.heptapod.net/mercurial/hg-git", "https://foss.heptapod.net/mercurial/hg-docgraph", "https://foss.heptapod.net/mercurial/mercurial-devel", "https://foss.heptapod.net/mercurial/pytest", "https://foss.heptapod.net/mercurial/scmperf", "--visit-type", "hg", ]
      +  command = [ "/opt/swh-e2e-checks/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "staging", "--warning", 300, "--critical", 600, "check-savecodenow", "--swh-web-url", "https://webapp.staging.swh.network", "origin", "https://foss.heptapod.net/mercurial/hgview", "https://foss.heptapod.net/mercurial/tortoisehg", "https://foss.heptapod.net/mercurial/evolve", "https://foss.heptapod.net/mercurial/hg-git", "https://foss.heptapod.net/mercurial/hg-docgraph", "https://foss.heptapod.net/mercurial/mercurial-devel", "https://foss.heptapod.net/mercurial/pytest", "https://foss.heptapod.net/mercurial/scmperf", "--visit-type", "hg", ]
         timeout = 900
       }
*******************************************
  Concat_fragment[icinga2::object::CheckCommand::staging-check-savecodenow-cmd-subversion-svn] =>
   parameters =>
     content =>
      @@ -3,5 +3,5 @@
         import "plugin-check-command"
      _
      -  command = [ "/opt/swh-e2e-checks/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "staging", "--warning", 300, "--critical", 600, "check-savecodenow", "--swh-web-url", "https://archive.softwareheritage.org", "origin", "https://subversion.renater.fr/anonscm/svn/panda", "https://svn.code.sf.net/p/freeorion/code", "https://svn.code.sf.net/p/swig/code", "https://svn.code.sf.net/p/zookeeper/code", "https://svn.code.sf.net/p/esitools/code", "https://svn.code.sf.net/p/sauerbraten/code/", "https://svn.code.sf.net/p/civ4mods/code", "https://svn.code.sf.net/p/ldap-sdk/code", "--visit-type", "svn", ]
      +  command = [ "/opt/swh-e2e-checks/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "staging", "--warning", 300, "--critical", 600, "check-savecodenow", "--swh-web-url", "https://webapp.staging.swh.network", "origin", "https://subversion.renater.fr/anonscm/svn/panda", "https://svn.code.sf.net/p/freeorion/code", "https://svn.code.sf.net/p/swig/code", "https://svn.code.sf.net/p/zookeeper/code", "https://svn.code.sf.net/p/esitools/code", "https://svn.code.sf.net/p/sauerbraten/code/", "https://svn.code.sf.net/p/civ4mods/code", "https://svn.code.sf.net/p/ldap-sdk/code", "--visit-type", "svn", ]
         timeout = 900
       }
*******************************************
  File[/etc/bind/keys/local-update] =>
   parameters =>
     content =>
      @@ -2,4 +2,4 @@
       key local-update {
        algorithm hmac-sha256;
      - secret "yhAHFO8+3Sy18tmgUYEXCj/PkAYqJZdqytqKFbK8LYqJKWNcbSAsWn8oukpLAkNlrmzVVt+Hzu8TgDrSt0ZSGA==";
      + secret "GrcscPoa+xK/XfmzvlsN195WkTRkAtTRGwygf7on0nXQR+Br2GnPFoCBwPAhWNmrVxMKynWZUUzLK6j1ZexckA==";
       };
*******************************************
  File[/etc/bind/rndc.key] =>
   parameters =>
     content =>
      @@ -2,4 +2,4 @@
       key rndc-key {
        algorithm hmac-md5;
      - secret "qbwV0nMNFwSsv1GQ0BBa7hkBox1K30QwJ6tkboxG9crYYNDM/XedCruz6XabvNGz5GLDhSd+m5nS/y8STouTZA==";
      + secret "WQZbWgP92dxiX2VH/ai8I6cWgSoncBgGP3XWzyn7eVu4gugDvEX7hPSyGLbma5COIdD86nKcOHcflT1Ci/9WmQ==";
       };
*******************************************
  Icinga2::Object::Checkcommand[staging-check-deposit-cmd] =>
   parameters =>
     command =>
      - ["/opt/swh-e2e-checks/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "staging", "--warning", "600", "--critical", "3600", "check-deposit", "--server", "https://deposit.softwareheritage.org/1", "--username", "swh", "--password", "swh-deploy-deposit-e2e-password", "--collection", "swh", "--provider-url", "https://www.softwareheritage.org", "--swh-web-url", "https://archive.softwareheritage.org", "--poll-interval", 1, "single", "--archive", "/opt/swh-e2e-checks/lib/python3.11/site-packages/swh/icinga_plugins/data/deposit/jesuisgpl.tgz", "--metadata", "/opt/swh-e2e-checks/lib/python3.11/site-packages/swh/icinga_plugins/data/deposit/jesuisgpl.tgz.xml"]
      + ["/opt/swh-e2e-checks/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "staging", "--warning", "600", "--critical", "3600", "check-deposit", "--server", "https://deposit.staging.swh.network/1", "--username", "swh", "--password", "swh-deploy-deposit-e2e-password", "--collection", "swh", "--provider-url", "https://www.softwareheritage.org", "--swh-web-url", "https://archive.softwareheritage.org", "--poll-interval", 1, "single", "--archive", "/opt/swh-e2e-checks/lib/python3.11/site-packages/swh/icinga_plugins/data/deposit/jesuisgpl.tgz", "--metadata", "/opt/swh-e2e-checks/lib/python3.11/site-packages/swh/icinga_plugins/data/deposit/jesuisgpl.tgz.xml"]
*******************************************
  Icinga2::Object::Checkcommand[staging-check-savecodenow-cmd-git-git] =>
   parameters =>
     command =>
      - ["/opt/swh-e2e-checks/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "staging", "--warning", "300", "--critical", "600", "check-savecodenow", "--swh-web-url", "https://archive.softwareheritage.org", "origin", "https://github.com/rdicosmo/parmap", "https://github.com/SoftwareHeritage/swh-core", "https://github.com/SoftwareHeritage/swh-lister", "https://github.com/SoftwareHeritage/swh-loader-bzr", "https://github.com/SoftwareHeritage/swh-loader-core", "https://github.com/SoftwareHeritage/swh-loader-git", "https://github.com/SoftwareHeritage/swh-loader-mercurial", "https://github.com/SoftwareHeritage/swh-loader-svn", "https://github.com/SoftwareHeritage/swh-model", "https://github.com/SoftwareHeritage/swh-web", "--visit-type", "git"]
      + ["/opt/swh-e2e-checks/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "staging", "--warning", "300", "--critical", "600", "check-savecodenow", "--swh-web-url", "https://webapp.staging.swh.network", "origin", "https://github.com/rdicosmo/parmap", "https://github.com/SoftwareHeritage/swh-core", "https://github.com/SoftwareHeritage/swh-lister", "https://github.com/SoftwareHeritage/swh-loader-bzr", "https://github.com/SoftwareHeritage/swh-loader-core", "https://github.com/SoftwareHeritage/swh-loader-git", "https://github.com/SoftwareHeritage/swh-loader-mercurial", "https://github.com/SoftwareHeritage/swh-loader-svn", "https://github.com/SoftwareHeritage/swh-model", "https://github.com/SoftwareHeritage/swh-web", "--visit-type", "git"]
*******************************************
  Icinga2::Object::Checkcommand[staging-check-savecodenow-cmd-mercurial-hg] =>
   parameters =>
     command =>
      - ["/opt/swh-e2e-checks/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "staging", "--warning", "300", "--critical", "600", "check-savecodenow", "--swh-web-url", "https://archive.softwareheritage.org", "origin", "https://foss.heptapod.net/mercurial/hgview", "https://foss.heptapod.net/mercurial/tortoisehg", "https://foss.heptapod.net/mercurial/evolve", "https://foss.heptapod.net/mercurial/hg-git", "https://foss.heptapod.net/mercurial/hg-docgraph", "https://foss.heptapod.net/mercurial/mercurial-devel", "https://foss.heptapod.net/mercurial/pytest", "https://foss.heptapod.net/mercurial/scmperf", "--visit-type", "hg"]
      + ["/opt/swh-e2e-checks/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "staging", "--warning", "300", "--critical", "600", "check-savecodenow", "--swh-web-url", "https://webapp.staging.swh.network", "origin", "https://foss.heptapod.net/mercurial/hgview", "https://foss.heptapod.net/mercurial/tortoisehg", "https://foss.heptapod.net/mercurial/evolve", "https://foss.heptapod.net/mercurial/hg-git", "https://foss.heptapod.net/mercurial/hg-docgraph", "https://foss.heptapod.net/mercurial/mercurial-devel", "https://foss.heptapod.net/mercurial/pytest", "https://foss.heptapod.net/mercurial/scmperf", "--visit-type", "hg"]
*******************************************
  Icinga2::Object::Checkcommand[staging-check-savecodenow-cmd-subversion-svn] =>
   parameters =>
     command =>
      - ["/opt/swh-e2e-checks/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "staging", "--warning", "300", "--critical", "600", "check-savecodenow", "--swh-web-url", "https://archive.softwareheritage.org", "origin", "https://subversion.renater.fr/anonscm/svn/panda", "https://svn.code.sf.net/p/freeorion/code", "https://svn.code.sf.net/p/swig/code", "https://svn.code.sf.net/p/zookeeper/code", "https://svn.code.sf.net/p/esitools/code", "https://svn.code.sf.net/p/sauerbraten/code/", "https://svn.code.sf.net/p/civ4mods/code", "https://svn.code.sf.net/p/ldap-sdk/code", "--visit-type", "svn"]
      + ["/opt/swh-e2e-checks/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "staging", "--warning", "300", "--critical", "600", "check-savecodenow", "--swh-web-url", "https://webapp.staging.swh.network", "origin", "https://subversion.renater.fr/anonscm/svn/panda", "https://svn.code.sf.net/p/freeorion/code", "https://svn.code.sf.net/p/swig/code", "https://svn.code.sf.net/p/zookeeper/code", "https://svn.code.sf.net/p/esitools/code", "https://svn.code.sf.net/p/sauerbraten/code/", "https://svn.code.sf.net/p/civ4mods/code", "https://svn.code.sf.net/p/ldap-sdk/code", "--visit-type", "svn"]
*******************************************
  Icinga2::Object[icinga2::object::CheckCommand::staging-check-deposit-cmd] =>
   parameters =>
     attrs =>
       command =>
        - ["/opt/swh-e2e-checks/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "staging", "--warning", "600", "--critical", "3600", "check-deposit", "--server", "https://deposit.softwareheritage.org/1", "--username", "swh", "--password", "swh-deploy-deposit-e2e-password", "--collection", "swh", "--provider-url", "https://www.softwareheritage.org", "--swh-web-url", "https://archive.softwareheritage.org", "--poll-interval", 1, "single", "--archive", "/opt/swh-e2e-checks/lib/python3.11/site-packages/swh/icinga_plugins/data/deposit/jesuisgpl.tgz", "--metadata", "/opt/swh-e2e-checks/lib/python3.11/site-packages/swh/icinga_plugins/data/deposit/jesuisgpl.tgz.xml"]
        + ["/opt/swh-e2e-checks/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "staging", "--warning", "600", "--critical", "3600", "check-deposit", "--server", "https://deposit.staging.swh.network/1", "--username", "swh", "--password", "swh-deploy-deposit-e2e-password", "--collection", "swh", "--provider-url", "https://www.softwareheritage.org", "--swh-web-url", "https://archive.softwareheritage.org", "--poll-interval", 1, "single", "--archive", "/opt/swh-e2e-checks/lib/python3.11/site-packages/swh/icinga_plugins/data/deposit/jesuisgpl.tgz", "--metadata", "/opt/swh-e2e-checks/lib/python3.11/site-packages/swh/icinga_plugins/data/deposit/jesuisgpl.tgz.xml"]
*******************************************
  Icinga2::Object[icinga2::object::CheckCommand::staging-check-savecodenow-cmd-git-git] =>
   parameters =>
     attrs =>
       command =>
        - ["/opt/swh-e2e-checks/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "staging", "--warning", "300", "--critical", "600", "check-savecodenow", "--swh-web-url", "https://archive.softwareheritage.org", "origin", "https://github.com/rdicosmo/parmap", "https://github.com/SoftwareHeritage/swh-core", "https://github.com/SoftwareHeritage/swh-lister", "https://github.com/SoftwareHeritage/swh-loader-bzr", "https://github.com/SoftwareHeritage/swh-loader-core", "https://github.com/SoftwareHeritage/swh-loader-git", "https://github.com/SoftwareHeritage/swh-loader-mercurial", "https://github.com/SoftwareHeritage/swh-loader-svn", "https://github.com/SoftwareHeritage/swh-model", "https://github.com/SoftwareHeritage/swh-web", "--visit-type", "git"]
        + ["/opt/swh-e2e-checks/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "staging", "--warning", "300", "--critical", "600", "check-savecodenow", "--swh-web-url", "https://webapp.staging.swh.network", "origin", "https://github.com/rdicosmo/parmap", "https://github.com/SoftwareHeritage/swh-core", "https://github.com/SoftwareHeritage/swh-lister", "https://github.com/SoftwareHeritage/swh-loader-bzr", "https://github.com/SoftwareHeritage/swh-loader-core", "https://github.com/SoftwareHeritage/swh-loader-git", "https://github.com/SoftwareHeritage/swh-loader-mercurial", "https://github.com/SoftwareHeritage/swh-loader-svn", "https://github.com/SoftwareHeritage/swh-model", "https://github.com/SoftwareHeritage/swh-web", "--visit-type", "git"]
*******************************************
  Icinga2::Object[icinga2::object::CheckCommand::staging-check-savecodenow-cmd-mercurial-hg] =>
   parameters =>
     attrs =>
       command =>
        - ["/opt/swh-e2e-checks/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "staging", "--warning", "300", "--critical", "600", "check-savecodenow", "--swh-web-url", "https://archive.softwareheritage.org", "origin", "https://foss.heptapod.net/mercurial/hgview", "https://foss.heptapod.net/mercurial/tortoisehg", "https://foss.heptapod.net/mercurial/evolve", "https://foss.heptapod.net/mercurial/hg-git", "https://foss.heptapod.net/mercurial/hg-docgraph", "https://foss.heptapod.net/mercurial/mercurial-devel", "https://foss.heptapod.net/mercurial/pytest", "https://foss.heptapod.net/mercurial/scmperf", "--visit-type", "hg"]
        + ["/opt/swh-e2e-checks/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "staging", "--warning", "300", "--critical", "600", "check-savecodenow", "--swh-web-url", "https://webapp.staging.swh.network", "origin", "https://foss.heptapod.net/mercurial/hgview", "https://foss.heptapod.net/mercurial/tortoisehg", "https://foss.heptapod.net/mercurial/evolve", "https://foss.heptapod.net/mercurial/hg-git", "https://foss.heptapod.net/mercurial/hg-docgraph", "https://foss.heptapod.net/mercurial/mercurial-devel", "https://foss.heptapod.net/mercurial/pytest", "https://foss.heptapod.net/mercurial/scmperf", "--visit-type", "hg"]
*******************************************
  Icinga2::Object[icinga2::object::CheckCommand::staging-check-savecodenow-cmd-subversion-svn] =>
   parameters =>
     attrs =>
       command =>
        - ["/opt/swh-e2e-checks/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "staging", "--warning", "300", "--critical", "600", "check-savecodenow", "--swh-web-url", "https://archive.softwareheritage.org", "origin", "https://subversion.renater.fr/anonscm/svn/panda", "https://svn.code.sf.net/p/freeorion/code", "https://svn.code.sf.net/p/swig/code", "https://svn.code.sf.net/p/zookeeper/code", "https://svn.code.sf.net/p/esitools/code", "https://svn.code.sf.net/p/sauerbraten/code/", "https://svn.code.sf.net/p/civ4mods/code", "https://svn.code.sf.net/p/ldap-sdk/code", "--visit-type", "svn"]
        + ["/opt/swh-e2e-checks/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "staging", "--warning", "300", "--critical", "600", "check-savecodenow", "--swh-web-url", "https://webapp.staging.swh.network", "origin", "https://subversion.renater.fr/anonscm/svn/panda", "https://svn.code.sf.net/p/freeorion/code", "https://svn.code.sf.net/p/swig/code", "https://svn.code.sf.net/p/zookeeper/code", "https://svn.code.sf.net/p/esitools/code", "https://svn.code.sf.net/p/sauerbraten/code/", "https://svn.code.sf.net/p/civ4mods/code", "https://svn.code.sf.net/p/ldap-sdk/code", "--visit-type", "svn"]
*******************************************
  Profile::Icinga2::Objects::E2e_checks_deposit[End-to-end Deposit Test(s) in staging] =>
   parameters =>
     deposit_server =>
      - https://deposit.softwareheritage.org/1
      + https://deposit.staging.swh.network/1
*******************************************
  Profile::Icinga2::Objects::E2e_checks_savecodenow[End-to-end SaveCodeNow Check - git with type git in staging] =>
   parameters =>
     server_webapp =>
      - https://archive.softwareheritage.org
      + https://webapp.staging.swh.network
*******************************************
  Profile::Icinga2::Objects::E2e_checks_savecodenow[End-to-end SaveCodeNow Check - mercurial with type hg in staging] =>
   parameters =>
     server_webapp =>
      - https://archive.softwareheritage.org
      + https://webapp.staging.swh.network
*******************************************
  Profile::Icinga2::Objects::E2e_checks_savecodenow[End-to-end SaveCodeNow Check - subversion with type svn in staging] =>
   parameters =>
     server_webapp =>
      - https://archive.softwareheritage.org
      + https://webapp.staging.swh.network
*******************************************
  Profile::Swh::Deploy::Deposit::Icinga_checks[deposit.softwareheritage.org] =>
   parameters =>
     deposit_server =>
      + deposit.softwareheritage.org
*******************************************
  Profile::Swh::Deploy::Deposit::Icinga_checks[deposit.staging.swh.network] =>
   parameters =>
     deposit_server =>
      + deposit.staging.swh.network
*******************************************
- Profile::Swh::Deploy::Vault::Icinga_checks[production]
*******************************************
- Profile::Swh::Deploy::Vault::Icinga_checks[staging]
*******************************************
+ Profile::Swh::Deploy::Vault::Icinga_checks[storage-postgresql-ro.internal.softwareheritage.org] =>
   parameters =>
     "environment": "production",
     "storage": "storage-postgresql-ro.internal.softwareheritage.org",
     "webapp": "https://archive.softwareheritage.org"
*******************************************
+ Profile::Swh::Deploy::Vault::Icinga_checks[storage-ro.internal.staging.swh.network] =>
   parameters =>
     "environment": "staging",
     "storage": "storage-ro.internal.staging.swh.network",
     "webapp": "https://webapp.staging.swh.network"
*******************************************
  Profile::Swh::Deploy::Webapp::Icinga_checks[archive.softwareheritage.org] =>
   parameters =>
     server_webapp =>
      + archive.softwareheritage.org
*******************************************
  Profile::Swh::Deploy::Webapp::Icinga_checks[webapp.staging.swh.network] =>
   parameters =>
     server_webapp =>
      + webapp.staging.swh.network
*******************************************
*** End octocatalog-diff on pergamon.softwareheritage.org
+ set +x
/home/tony/work/inria/repo/swh/puppet-environment/swh-site

Refs. swh/infra/sysadm-environment#5588 (closed)

site-modules/profile/manifests/icinga2/objects/static_checks.pp

@@ -25,11 +25,6 @@ class profile::icinga2::objects::static_checks {
     },
   }
 
-  ::profile::swh::deploy::webapp::icinga_checks {'archive.softwareheritage.org':
-    environment => "production",
-    host_name   => "moma.softwareheritage.org",
-  }
-
   ::icinga2::object::host {'archive-production-rke2':
     check_command => 'dummy',
     address       => 'k8s-archive-production-rke2.internal.softwareheritage.org',
@@ -52,9 +47,14 @@ class profile::icinga2::objects::static_checks {
     },
   }
 
+  ::profile::swh::deploy::webapp::icinga_checks {'archive.softwareheritage.org':
+    environment => "production",
+    host_name   => "moma.softwareheritage.org",
+  }
+
   ::profile::swh::deploy::webapp::icinga_checks {'webapp.staging.swh.network':
-    environment      => "staging",
-    host_name        => "archive-staging-rke2",
+    environment => "staging",
+    host_name   => "archive-staging-rke2",
   }
 
   ::profile::swh::deploy::deposit::icinga_checks {'deposit.softwareheritage.org':
@@ -63,17 +63,17 @@ class profile::icinga2::objects::static_checks {
   }
 
   ::profile::swh::deploy::deposit::icinga_checks {'deposit.staging.swh.network':
-    environment      => "staging",
-    host_name        => "archive-staging-rke2",
+    environment => "staging",
+    host_name   => "archive-staging-rke2",
   }
 
-  ::profile::swh::deploy::vault::icinga_checks {'production':
-    storage     => "http://storage-postgresql-ro.internal.softwareheritage.org",
+  ::profile::swh::deploy::vault::icinga_checks {'storage-postgresql-ro.internal.softwareheritage.org':
+    environment => "production",
     webapp      => "https://archive.softwareheritage.org",
   }
 
-  ::profile::swh::deploy::vault::icinga_checks {'staging':
-    storage     => "http://storage-ro.internal.staging.swh.network",
+  ::profile::swh::deploy::vault::icinga_checks {'storage-ro.internal.staging.swh.network':
+    environment => "staging",
     webapp      => "https://webapp.staging.swh.network",
   }