Revert "binhosts: Dedup binpkg uploads."
This reverts commit 171548978f9cac82eb8bdb5102b0f08284db4b01.
Reason for revert: Prebuilt paths do not contain expected binpks.
Original change's description:
> binhosts: Dedup binpkg uploads.
>
> Deduplicate binpkg uploads to prevent reuploading duplicates.
>
> BUG=b:242012416
> TEST=run_tests
>
> Change-Id: I925dc378474912e762c9202d8492b02d186ffdd8
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/3821936
> Tested-by: Alex Klein <saklein@chromium.org>
> Commit-Queue: Alex Klein <saklein@chromium.org>
> Reviewed-by: Mike Frysinger <vapier@chromium.org>
Bug: b:242012416, b:242715231
Change-Id: I56730314575de1f861fa7857b0055f23fa3a56bb
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/3834523
Commit-Queue: Piotr Pawliczek <pawliczek@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
diff --git a/api/controller/binhost.py b/api/controller/binhost.py
index 3e2b4ff..e79917a 100644
--- a/api/controller/binhost.py
+++ b/api/controller/binhost.py
@@ -125,8 +125,6 @@
if not gs.PathIsGs(uri):
raise ValueError('Upload URI %s must be Google Storage.' % uri)
- package_index_paths = [f.path.path for f in input_proto.package_index_files]
-
if config.validate_only:
return controller.RETURN_CODE_VALID_INPUT
@@ -139,7 +137,7 @@
uploads_dir = binhost.GetPrebuiltsRoot(chroot, sysroot, build_target)
index_path = binhost.UpdatePackageIndex(
uploads_dir, upload_uri, upload_path, sudo=True)
- upload_targets = binhost.GetPrebuiltsFiles(uploads_dir, package_index_paths)
+ upload_targets = binhost.GetPrebuiltsFiles(uploads_dir)
assert index_path.startswith(uploads_dir), (
'expected index_path to start with uploads_dir')
upload_targets.append(index_path[len(uploads_dir):])