Skip to content

(v1) e2e-checks: Install vault/deposit checks for production and staging

It was only installed for production so far.

Related to T3133

Test Plan

for vault and deposit instances, this displays nothing as expected (it's only exported resources).

on pergamon, this outputs only checks that disappears, that's a bit surprising... But that might be explanable as i'm going from explicit declation to an implicit one.

$ bin/octocatalog-diff --octocatalog-diff-args --no-truncate-details --to staging pergamon
Found host pergamon.softwareheritage.org
WARN     -> Environment "staging-e2e-checks2" contained non-word characters, correcting name to staging_e2e_checks2
WARN     -> Environment "wip-pg-hba-rules-in-yaml" contained non-word characters, correcting name to wip_pg_hba_rules_in_yaml
Cloning into '/tmp/swh-ocd.IMWx3tmO/environments/production/data/private'...
done.
Cloning into '/tmp/swh-ocd.IMWx3tmO/environments/staging/data/private'...
done.
*** Running octocatalog-diff on host pergamon.softwareheritage.org
I, [2021-03-16T14:29:31.574995 #17285]  INFO -- : Catalogs compiled for pergamon.softwareheritage.org
W, [2021-03-16T14:29:38.838327 #17285]  WARN -- : Resource File[/tmp/ocd-ipc-20210316-17285-1g42l2i/ocd-builddir-20210316-17293-11xkjev/routes.yaml] appears to depend on catalog compilation directory. Suppressed from results.
W, [2021-03-16T14:29:38.838402 #17285]  WARN -- : Resource File[/tmp/ocd-ipc-20210316-17285-1g42l2i/ocd-builddir-20210316-17290-16xhdib/routes.yaml] appears to depend on catalog compilation directory. Suppressed from results.
W, [2021-03-16T14:29:38.839312 #17285]  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, [2021-03-16T14:29:38.839336 #17285]  WARN -- : Resource key Ini_setting[puppetdbserver_urls] parameters => path appears to depend on catalog compilation directory. Suppressed from results.
W, [2021-03-16T14:29:38.839378 #17285]  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, [2021-03-16T14:29:38.839393 #17285]  WARN -- : Resource key Ini_setting[soft_write_failure] parameters => path appears to depend on catalog compilation directory. Suppressed from results.
I, [2021-03-16T14:29:38.840326 #17285]  INFO -- : Diffs computed for pergamon.softwareheritage.org
diff origin/production/pergamon.softwareheritage.org current/pergamon.softwareheritage.org
*******************************************
- Concat::Fragment[icinga2::object::CheckCommand::check-deposit-cmd]
*******************************************
- Concat::Fragment[icinga2::object::CheckCommand::check-vault-cmd]
*******************************************
- Concat::Fragment[icinga2::object::Service::check-deposit]
*******************************************
- Concat::Fragment[icinga2::object::Service::check-vault]
*******************************************
- Concat[/etc/icinga2/conf.d/e2e-checks.conf]
*******************************************
- Concat[/etc/icinga2/zones.d/master/pergamon.softwareheritage.org.conf]
*******************************************
- Concat_file[/etc/icinga2/conf.d/e2e-checks.conf]
*******************************************
- Concat_file[/etc/icinga2/zones.d/master/pergamon.softwareheritage.org.conf]
*******************************************
- Concat_fragment[/etc/icinga2/conf.d/e2e-checks.conf_header]
*******************************************
- Concat_fragment[/etc/icinga2/zones.d/master/pergamon.softwareheritage.org.conf_header]
*******************************************
- Concat_fragment[icinga2::object::CheckCommand::check-deposit-cmd]
*******************************************
- Concat_fragment[icinga2::object::CheckCommand::check-vault-cmd]
*******************************************
- Concat_fragment[icinga2::object::Service::check-deposit]
*******************************************
- Concat_fragment[icinga2::object::Service::check-vault]
*******************************************
  File[/etc/bind/keys/local-update] =>
   parameters =>
     content =>
      @@ -2,4 +2,4 @@
       key local-update {
        algorithm hmac-sha256;
      - secret "2YcTvot80MKoP9QKRNKnHwsTJurVKDTfOh8ibP5NAz5Ssu/DWzaJP7dQf2PGeU63+GDYP/s9c+ais/aSj25EVw==";
      + secret "Zj85GV32D26QkMwj3kEocVQTGGV1FLrQ7qrvR1/BUcf0Phu6esvoUs9elLi3uX/EFQ4A5tVr0Hgde2sllz0Rbw==";
       };
*******************************************
  File[/etc/bind/rndc.key] =>
   parameters =>
     content =>
      @@ -2,4 +2,4 @@
       key rndc-key {
        algorithm hmac-md5;
      - secret "TM5c1DZpz/WybezUgIomCigkriVJafcyW/uEbPKYGma2IprFjJlad48ytIKfFgWh76/IL7+a4XwTh8u8ycV1lg==";
      + secret "VOgFRD6AppnafgCq3o8eDiZtj0kG9W/pgnI+oegiqHiQsUoIoS0ynJm8en93eOZ9c1r48mR7pucq1sthgcYgyA==";
       };
*******************************************
- Icinga2::Object::Checkcommand[check-deposit-cmd]
*******************************************
- Icinga2::Object::Checkcommand[check-vault-cmd]
*******************************************
- Icinga2::Object::Service[check-deposit]
*******************************************
- Icinga2::Object::Service[check-vault]
*******************************************
- Icinga2::Object[icinga2::object::CheckCommand::check-deposit-cmd]
*******************************************
- Icinga2::Object[icinga2::object::CheckCommand::check-vault-cmd]
*******************************************
- Icinga2::Object[icinga2::object::Service::check-deposit]
*******************************************
- Icinga2::Object[icinga2::object::Service::check-vault]
*******************************************
- Package[python3-swh.icingaplugins]
*******************************************
*** End octocatalog-diff on pergamon.softwareheritage.org

Migrated from D5257 (view on Phabricator)

Merge request reports