From db0852f9d8342a6a3bbe4161796d8a41e0cb86b1 Mon Sep 17 00:00:00 2001 From: John Lee Date: Mon, 18 Sep 2023 15:22:55 -0400 Subject: [PATCH 1/3] Paginate through results from releases bucket --- .../mule/deploy/releases_page/generate_releases_page.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/release/mule/deploy/releases_page/generate_releases_page.py b/scripts/release/mule/deploy/releases_page/generate_releases_page.py index 88f70c6384..73746adbfe 100755 --- a/scripts/release/mule/deploy/releases_page/generate_releases_page.py +++ b/scripts/release/mule/deploy/releases_page/generate_releases_page.py @@ -213,12 +213,19 @@ def main(): # 'releases/beta/f9fa9a084_2.5.2' => [file_obj1, file_obj2, ...] release_sets = get_stage_release_set(staging_response) + release_contents = [] # List everything from the releases bucket s3://algorand-releases/ releases_response = s3.list_objects_v2(Bucket=releases_bucket) + release_contents.extend(releases_response["Contents"]) + + # If response was truncated, keep looping and appending + while (releases_response["IsTruncated"] == True): + releases_response = s3.list_objects_v2(Bucket=releases_bucket, ContinuationToken=releases_response["NextContinuationToken"]) + release_contents.extend(releases_response["Contents"]) # Return dict keyed by filename of file_objs from # s3://algorand-releases/ - release_files = objects_by_fname(releases_response["Contents"]) + release_files = objects_by_fname(release_contents) table = [] From 3f45b07c84c1d1b759b918fe1d368aea6c116334 Mon Sep 17 00:00:00 2001 From: John Lee Date: Mon, 18 Sep 2023 15:48:01 -0400 Subject: [PATCH 2/3] Make sure to copy RPM sig files to releases bucket --- scripts/release/mule/deploy/rpm/deploy.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/release/mule/deploy/rpm/deploy.sh b/scripts/release/mule/deploy/rpm/deploy.sh index 1e9719df55..c11c106c33 100755 --- a/scripts/release/mule/deploy/rpm/deploy.sh +++ b/scripts/release/mule/deploy/rpm/deploy.sh @@ -78,6 +78,8 @@ then cp -r /root/rpmrepo . else aws s3 sync rpmrepo "s3://algorand-releases/rpm/$CHANNEL/" + # sync signatures to releases so that the .sig files load from there + aws s3 sync s3://$S3_SOURCE/releases/$CHANNEL/ s3://algorand-releases/rpm/sigs/$CHANNEL/ --exclude='*' --include='*.rpm.sig' fi echo From a5d34b2a66a1b05742cb0bb563655eb677041d4d Mon Sep 17 00:00:00 2001 From: John Lee Date: Wed, 20 Sep 2023 11:11:43 -0400 Subject: [PATCH 3/3] Remove unnecessary paranetheses --- .../release/mule/deploy/releases_page/generate_releases_page.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/release/mule/deploy/releases_page/generate_releases_page.py b/scripts/release/mule/deploy/releases_page/generate_releases_page.py index 73746adbfe..07d7ce70a0 100755 --- a/scripts/release/mule/deploy/releases_page/generate_releases_page.py +++ b/scripts/release/mule/deploy/releases_page/generate_releases_page.py @@ -219,7 +219,7 @@ def main(): release_contents.extend(releases_response["Contents"]) # If response was truncated, keep looping and appending - while (releases_response["IsTruncated"] == True): + while releases_response["IsTruncated"] == True: releases_response = s3.list_objects_v2(Bucket=releases_bucket, ContinuationToken=releases_response["NextContinuationToken"]) release_contents.extend(releases_response["Contents"])