starlingx/update
Code Issues Proposed changes

Merge "Invert order of undeploying inactive deployments"

Browse Source
This commit is contained in:
Zuul
2024-11-18 13:44:48 +00:00
committed by Gerrit Code Review
parent fa4c038ab2 7f900f5da1
commit ebaee5db6d
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
software/software/ostree_utils.py
View File

@@ -500,7 +500,8 @@ def delete_older_deployments():
def undeploy_inactive_deployments():
"""
Remove deployments other than the current deployment,
i.e. deployments from index 1 to len(deployments) - 1
i.e. deployments from index 1 to len(deployments) - 1,
in the reverse order, from the oldest to the newest
"""
cmd = ["ostree", "admin", "status"]
try:
@@ -513,8 +514,8 @@ def undeploy_inactive_deployments():
pattern = r"debian [a-z0-9]+.[0-9]+"
deployments = re.findall(pattern, output.stdout)
# skip the first (active) deployment
for index, deployment in enumerate(deployments[1:], 1):
commit_id = deployment.lstrip("debian ").split(".")[0]
for index, deployment in reversed(list(enumerate(deployments[1:], 1))):
commit_id = deployment.replace("debian ", "").split(".")[0]
cmd = ["ostree", "admin", "undeploy", str(index)]
try:
subprocess.run(cmd, check=True)