Skip to content

Commit

Permalink
tests: Cleanup generate_support_bundle() to not fail
Browse files Browse the repository at this point in the history
The Support bundle generation was/is failing in both
our upstream ci and locally.  This cleans up the failures
that I am seeing such that tests now continue to run
instead of aborting the test run.

Signed-off-by: Donald Sharp <[email protected]>
  • Loading branch information
donaldsharp committed Apr 10, 2024
1 parent 4fb3364 commit ea570f2
Showing 1 changed file with 14 additions and 2 deletions.
16 changes: 14 additions & 2 deletions tests/topotests/lib/common_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -936,14 +936,26 @@ def generate_support_bundle():
"""

tgen = get_topogen()
if tgen is None:
logger.warn(
"Support bundle attempted to be generated, but topogen is not being used"
)
return True

router_list = tgen.routers()
test_name = os.environ.get("PYTEST_CURRENT_TEST").split(":")[-1].split(" ")[0]

bundle_procs = {}
for rname, rnode in router_list.items():
logger.info("Spawn collection of support bundle for %s", rname)
dst_bundle = "{}/{}/support_bundles/{}".format(tgen.logdir, rname, test_name)
rnode.run("mkdir -p " + dst_bundle)
try:
dst_bundle = "{}/{}/support_bundles/{}".format(
tgen.logdir, rname, test_name
)
rnode.run("mkdir -p " + dst_bundle)
except Exception as err:
logger.error("Generation of Support bundle failed {}".format(err))
return True

gen_sup_cmd = [
"/usr/lib/frr/generate_support_bundle.py",
Expand Down

0 comments on commit ea570f2

Please sign in to comment.