Skip to content

Commit

Permalink
Don't test nrpe bits on rabbitmq-server. (#793)
Browse files Browse the repository at this point in the history
When the nrpe application is not deployed in the model skip the test
that checks for the correct configuration of the nagios checks, this is
because at the moment nrpe has no support for jammy, hence is not being
deployed in the jammy-yoga bundles.

Jammy support for nrpe is tracked at http://pad.lv/1968008
  • Loading branch information
freyes authored and ajkavanagh committed Dec 23, 2022
1 parent b9f6774 commit a2d856d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
1 change: 1 addition & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ skip_missing_interpreters = False
# https://stackoverflow.com/a/38133283
requires = pip < 20.3
virtualenv < 20.0
tox < 4.0.0
# NOTE: https://wiki.canonical.com/engineering/OpenStack/InstallLatestToxOnOsci
minversion = 3.2.0

Expand Down
7 changes: 7 additions & 0 deletions zaza/openstack/charm_tests/rabbitmq_server/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,13 @@ def _retry_check_commands_on_units(self, cmds, units):

def test_414_rmq_nrpe_monitors(self):
"""Check rabbimq-server nrpe monitor basic functionality."""
try:
zaza.model.get_application("nrpe")
except KeyError:
logging.warn(("Skipping as nrpe is not deployed. "
"http://pad.lv/1968008"))
return

units = zaza.model.get_units(self.application_name)
host_names = generic_utils.get_unit_hostnames(units)

Expand Down

0 comments on commit a2d856d

Please sign in to comment.