BinhostService: Remove deduplication of packages.
The original problem may have been entirely permissions based.
If so, not deduplicating the uploads manually would be preferred.
BUG=chromium:963528
TEST=run_tests
Change-Id: I4ef23238678906b8041004bb59285d616679239b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1669814
Tested-by: Alex Klein <saklein@chromium.org>
Auto-Submit: Alex Klein <saklein@chromium.org>
Reviewed-by: Evan Hernandez <evanhernandez@chromium.org>
diff --git a/api/controller/binhost.py b/api/controller/binhost.py
index b2f5df8..a80e8d5 100644
--- a/api/controller/binhost.py
+++ b/api/controller/binhost.py
@@ -90,8 +90,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]
-
parsed_uri = urlparse.urlparse(uri)
upload_uri = gs.GetGsURL(parsed_uri.netloc, for_gsutil=True).rstrip('/')
upload_path = parsed_uri.path.lstrip('/')
@@ -101,7 +99,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):])