diff options
Diffstat (limited to 'tools/autobuild/remove_old_firmware.py')
| -rwxr-xr-x | tools/autobuild/remove_old_firmware.py | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/tools/autobuild/remove_old_firmware.py b/tools/autobuild/remove_old_firmware.py index e9d2e8aae..a6203531c 100755 --- a/tools/autobuild/remove_old_firmware.py +++ b/tools/autobuild/remove_old_firmware.py @@ -14,7 +14,7 @@ def main(): # SSH to get list of existing files. p = subprocess.run( - ["ssh", ssh_machine, "find", ssh_firmware_dir, "-name", "\\*-unstable-v\\*"], + ["ssh", ssh_machine, "find", ssh_firmware_dir, "-name", "\\*-preview.\\*"], capture_output=True, ) if p.returncode != 0: @@ -26,31 +26,33 @@ def main(): boards = {} for file in all_files: m = re.match( - rb"([a-z/.]+)/([A-Za-z0-9_-]+)-(20[0-9]{6})-unstable-(v[0-9.-]+-g[0-9a-f]+).", + rb"([a-z/.]+)/([A-Za-z0-9_-]+)-(20[0-9]{6})-(v[0-9.]+)-preview.([0-9]+).g[0-9a-f]+.", file, ) if not m: continue - dir, board, date, version = m.groups() + dir, board, date, version, ncommits = m.groups() if board not in boards: boards[board] = {} - if (date, version) not in boards[board]: - boards[board][(date, version)] = [] - boards[board][(date, version)].append(file) + if (date, version, ncommits) not in boards[board]: + boards[board][(date, version, ncommits)] = [] + boards[board][(date, version, ncommits)].append(file) # Collect files to remove based on date and version. remove = [] for board in boards.values(): - filelist = [(date, version, files) for (date, version), files in board.items()] + filelist = [ + (date, version, ncommits, files) for (date, version, ncommits), files in board.items() + ] filelist.sort(reverse=True) keep = [] - for date, version, files in filelist: - if keep and version == keep[-1]: + for date, version, ncommits, files in filelist: + if keep and (version, ncommits) == keep[-1]: remove.extend(files) elif len(keep) >= NUM_KEEP_PER_BOARD: remove.extend(files) else: - keep.append(version) + keep.append((version, ncommits)) if DEBUG: all_files.sort(reverse=True) |