Skip to content

Commit

Permalink
Add waiting for endpoints between units scaling
Browse files Browse the repository at this point in the history
Traefik might take some time to update its configuration,
and switch multiple times between active and maintenance for the duration.
Waiting only for tests is not enough. This change introduce a wait
for endpoints to be ready.

Moreover, at glance call to setup the image might fail because of this
very reason, add a retry on render_tempest_config_keystone_v3.
  • Loading branch information
gboutry committed Sep 28, 2023
1 parent 89ef6fa commit 850db0c
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions zaza/openstack/charm_tests/tempest/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
import logging
import os
import subprocess
import tenacity

import zaza
import zaza.charm_lifecycle.utils
import zaza.charm_lifecycle.test
import zaza.openstack.charm_tests.tempest.utils as tempest_utils
import zaza.charm_lifecycle.utils as lifecycle_utils
import tempfile
import tenacity


class TempestTestBase():
Expand Down Expand Up @@ -183,7 +183,11 @@ def run(self):
:returns: Status of tempest run
:rtype: bool
"""
tempest_utils.render_tempest_config_keystone_v3(minimal=True)
render_tempest_config_keystone_v3 = tenacity.retry(
wait=tenacity.wait_fixed(10), stop=tenacity.stop_after_attempt(3)
)(tempest_utils.render_tempest_config_keystone_v3)
zaza.openstack.charm_tests.keystone.setup.wait_for_all_endpoints()
render_tempest_config_keystone_v3(minimal=True)
if not super().run():
return False

Expand All @@ -193,7 +197,8 @@ def run(self):
zaza.model.block_until_all_units_idle()
logging.info("Wait for status ready ...")
zaza.model.wait_for_application_states(states=self.expected_statuses)
tempest_utils.render_tempest_config_keystone_v3(minimal=True)
zaza.openstack.charm_tests.keystone.setup.wait_for_all_endpoints()
render_tempest_config_keystone_v3(minimal=True)
if not super().run():
return False

Expand All @@ -206,7 +211,8 @@ def run(self):
zaza.model.block_until_all_units_idle()
logging.info("Wait for status ready ...")
zaza.model.wait_for_application_states(states=self.expected_statuses)
tempest_utils.render_tempest_config_keystone_v3(minimal=True)
zaza.openstack.charm_tests.keystone.setup.wait_for_all_endpoints()
render_tempest_config_keystone_v3(minimal=True)
return super().run()


Expand Down

0 comments on commit 850db0c

Please sign in to comment.