Add complex bundles on mocked_plans

- order apps by charm and application name to have always the same sequence
gabrielcocenza · Apr 23, 2024 · f62eac1 · f62eac1
1 parent 857ddaf
commit f62eac1
Show file tree

Hide file tree

Showing 5 changed files with 8,134 additions and 43 deletions.
diff --git a/cou/steps/analyze.py b/cou/steps/analyze.py
@@ -134,7 +134,9 @@ async def _populate(cls, model: juju_utils.Model) -> list[OpenStackApplication]:
             key=lambda app: UPGRADE_ORDER.index(app.charm),
         )
         # order by charm name to have a predictable upgrade sequence of other o7k charms.
-        other_o7k_apps_sorted_by_name = sorted(other_o7k_apps, key=lambda app: app.charm)
+        other_o7k_apps_sorted_by_name = sorted(
+            other_o7k_apps, key=lambda app: (app.charm, app.name)
+        )
         return sorted_apps_to_upgrade_in_order + other_o7k_apps_sorted_by_name
 
     def __str__(self) -> str:

diff --git a/tests/mocked_plans/conftest.py b/tests/mocked_plans/conftest.py