Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #23091 from cpennington/replace-coverage-contexts-during-upload

Browse Source 
Replace old coverage context files when uploading
This commit is contained in:
Calen Pennington
2020-02-12 13:00:46 -05:00
committed by GitHub
parent 47393b5f7e 646cf1ed12
commit 829aa23db3
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pavelib/utils/db_utils.py
View File

@@ -211,7 +211,7 @@ def create_tarfile_from_db_cache(fingerprint, files, path):
return zipfile_name, zipfile_path return zipfile_name, zipfile_path
def upload_to_s3(file_name, file_path, bucket_name): def upload_to_s3(file_name, file_path, bucket_name, replace=False):
""" """
Upload the specified files to an s3 bucket. Upload the specified files to an s3 bucket.
""" """
@@ -229,7 +229,7 @@ def upload_to_s3(file_name, file_path, bucket_name):
"Continuing without uploading the new cache to S3.") "Continuing without uploading the new cache to S3.")
return return
key = boto.s3.key.Key(bucket=bucket, name=file_name) key = boto.s3.key.Key(bucket=bucket, name=file_name)
bytes_written = key.set_contents_from_filename(file_path, replace=False, policy='public-read') bytes_written = key.set_contents_from_filename(file_path, replace=replace, policy='public-read')
if bytes_written: if bytes_written:
msg = u"Wrote {} bytes to {}.".format(bytes_written, key.name) msg = u"Wrote {} bytes to {}.".format(bytes_written, key.name)
else: else:

3
pavelib/utils/test/utils.py
View File

@@ -179,5 +179,6 @@ def upload_coverage_to_s3():
upload_to_s3( upload_to_s3(
COVERAGE_CACHE_BASELINE, COVERAGE_CACHE_BASELINE,
'reports/{}.coverage'.format(os.environ.get('TEST_SUITE', '')), 'reports/{}.coverage'.format(os.environ.get('TEST_SUITE', '')),
COVERAGE_CACHE_BUCKET COVERAGE_CACHE_BUCKET,
replace=True,
) )