Rename graphs's names to reduce repetition
Change-Id: If3908b90e973ec0e14143c6987cb7dcd0bbcffce
This commit is contained in:
parent
90af105bdb
commit
9ef15eb9b5
@ -65,14 +65,14 @@ def upgrade_db_with_graph(orig_id, seed_id):
|
||||
|
||||
# If any failure try to rollback ONLY original environment.
|
||||
try:
|
||||
deploy.execute_graph_and_wait("upgrade-db-orig", orig_id)
|
||||
deploy.execute_graph_and_wait("upgrade-db-seed", seed_id)
|
||||
deploy.execute_graph_and_wait("upgrade-db", orig_id)
|
||||
deploy.execute_graph_and_wait("upgrade-db", seed_id)
|
||||
except Exception:
|
||||
cluster_graphs = deploy.get_cluster_graph_names(orig_id)
|
||||
if "upgrade-db-orig-rollback" in cluster_graphs:
|
||||
if "upgrade-db-rollback" in cluster_graphs:
|
||||
LOG.info("Trying to rollback 'upgrade-db' on the "
|
||||
"orig environment '%s'.", orig_id)
|
||||
deploy.execute_graph_and_wait("upgrade-db-orig-rollback", orig_id)
|
||||
deploy.execute_graph_and_wait("upgrade-db-rollback", orig_id)
|
||||
raise
|
||||
|
||||
|
||||
|
@ -44,66 +44,66 @@ def test_parser_exclusive_group(mocker, octane_app):
|
||||
# Orig is fine, seed is fine and there is no need to rollback.
|
||||
(
|
||||
[
|
||||
("upgrade-db-orig", False),
|
||||
("upgrade-db-seed", False),
|
||||
("upgrade-db", False),
|
||||
("upgrade-db", False),
|
||||
],
|
||||
["upgrade-db-orig", "upgrade-db-orig-rollback", "upgrade-db-seed"],
|
||||
["upgrade-db", "upgrade-db-rollback", "upgrade-db"],
|
||||
None,
|
||||
),
|
||||
# Orig is fine, seed fails and there is no rollback.
|
||||
(
|
||||
[
|
||||
("upgrade-db-orig", False),
|
||||
("upgrade-db-seed", True),
|
||||
("upgrade-db", False),
|
||||
("upgrade-db", True),
|
||||
],
|
||||
["upgrade-db-orig", "upgrade-db-seed"],
|
||||
"upgrade-db-seed",
|
||||
["upgrade-db", "upgrade-db"],
|
||||
"upgrade-db",
|
||||
),
|
||||
# Orig is fine, seed fails and rollback is fine.
|
||||
(
|
||||
[
|
||||
("upgrade-db-orig", False),
|
||||
("upgrade-db-seed", True),
|
||||
("upgrade-db-orig-rollback", False),
|
||||
("upgrade-db", False),
|
||||
("upgrade-db", True),
|
||||
("upgrade-db-rollback", False),
|
||||
],
|
||||
["upgrade-db-orig", "upgrade-db-orig-rollback", "upgrade-db-seed"],
|
||||
"upgrade-db-seed",
|
||||
["upgrade-db", "upgrade-db-rollback", "upgrade-db"],
|
||||
"upgrade-db",
|
||||
),
|
||||
# Orig is fine, seed fails and rollback fails too.
|
||||
(
|
||||
[
|
||||
("upgrade-db-orig", False),
|
||||
("upgrade-db-seed", True),
|
||||
("upgrade-db-orig-rollback", True),
|
||||
("upgrade-db", False),
|
||||
("upgrade-db", True),
|
||||
("upgrade-db-rollback", True),
|
||||
],
|
||||
["upgrade-db-orig", "upgrade-db-orig-rollback", "upgrade-db-seed"],
|
||||
"upgrade-db-orig-rollback",
|
||||
["upgrade-db", "upgrade-db-rollback", "upgrade-db"],
|
||||
"upgrade-db-rollback",
|
||||
),
|
||||
# Orig fails and there is no rollback.
|
||||
(
|
||||
[
|
||||
("upgrade-db-orig", True),
|
||||
("upgrade-db", True),
|
||||
],
|
||||
["upgrade-db-orig", "upgrade-db-seed"],
|
||||
"upgrade-db-orig",
|
||||
["upgrade-db", "upgrade-db"],
|
||||
"upgrade-db",
|
||||
),
|
||||
# Orig fails, rollback is fine.
|
||||
(
|
||||
[
|
||||
("upgrade-db-orig", True),
|
||||
("upgrade-db-orig-rollback", False),
|
||||
("upgrade-db", True),
|
||||
("upgrade-db-rollback", False),
|
||||
],
|
||||
["upgrade-db-orig", "upgrade-db-orig-rollback", "upgrade-db-seed"],
|
||||
"upgrade-db-orig",
|
||||
["upgrade-db", "upgrade-db-rollback", "upgrade-db"],
|
||||
"upgrade-db",
|
||||
),
|
||||
# Orig fails, rollback is also fails.
|
||||
(
|
||||
[
|
||||
("upgrade-db-orig", True),
|
||||
("upgrade-db-orig-rollback", True),
|
||||
("upgrade-db", True),
|
||||
("upgrade-db-rollback", True),
|
||||
],
|
||||
["upgrade-db-orig", "upgrade-db-orig-rollback", "upgrade-db-seed"],
|
||||
"upgrade-db-orig-rollback",
|
||||
["upgrade-db", "upgrade-db-rollback", "upgrade-db"],
|
||||
"upgrade-db-rollback",
|
||||
),
|
||||
])
|
||||
def test_upgrade_db_with_graph(mocker, calls, graph_names, catch):
|
||||
|
Loading…
Reference in New Issue
Block a user