diff --git a/stages/publish/create_repo_map_default.py b/stages/publish/create_repo_map_default.py index 15b2db1a095134a5d514b96f079c99291064879e..75bdea0a785fe79386dc4e26c5413687c7570bbd 100644 --- a/stages/publish/create_repo_map_default.py +++ b/stages/publish/create_repo_map_default.py @@ -26,7 +26,7 @@ def get_repomap(object_name, bucket="ironbank-pipeline-artifacts"): print(object_name) try: response = s3_client.download_file(bucket, object_name, "repo_map.json") - logging.debug(f"S3 download response: {response}") + logging.debug(f"S3 download response code: {response.status_code}") except ClientError as e: logging.error(e) print("Existing repo_map.json not found, creating new repo_map.json") diff --git a/stages/publish/create_repo_map_other.py b/stages/publish/create_repo_map_other.py index 3f105be35807c870a1b4922af525889c0761606c..accbf98bb4733de3182033834126b40f43b167f6 100644 --- a/stages/publish/create_repo_map_other.py +++ b/stages/publish/create_repo_map_other.py @@ -26,7 +26,7 @@ def get_repomap(object_name, bucket="ironbank-pipeline-artifacts"): print(object_name) try: response = s3_client.download_file(bucket, object_name, "repo_map.json") - logging.debug(f"S3 download response: {response}") + logging.debug(f"S3 download response code: {response.status_code}") except ClientError as e: logging.error(e) print("Existing repo_map.json not found, creating new repo_map.json") diff --git a/stages/publish/s3_upload.py b/stages/publish/s3_upload.py index 02959b03c227820c5d4173ae12b6dc58d39a405a..6ac95ee9dcb699b1f9f4449f875d7ff6dd7e9285 100644 --- a/stages/publish/s3_upload.py +++ b/stages/publish/s3_upload.py @@ -61,7 +61,7 @@ def upload_file(file_name, bucket, object_name=None): ) try: response = s3_client.upload_file(file_name, bucket, object_name, extra_args) - logging.debug(f"S3 upload response: {response}") + logging.debug(f"S3 upload response code: {response.status_code}") except ClientError as e: logging.error(e) return False diff --git a/stages/publish/upload-to-s3-run.sh b/stages/publish/upload-to-s3-run.sh index a64a7e4e417a33fd5bea59d55725725865f2e625..96ab9d78ce9f7cd5ed2f30994cdb5dc7643396b7 100755 --- a/stages/publish/upload-to-s3-run.sh +++ b/stages/publish/upload-to-s3-run.sh @@ -52,4 +52,4 @@ done python3 "${PIPELINE_REPO_DIR}/stages/publish/s3_upload.py" --file "${PROJECT_README}" --bucket "${S3_REPORT_BUCKET}" --dest "${BASE_BUCKET_DIRECTORY}/${IMAGE_PATH}/${IMAGE_VERSION}/${REMOTE_REPORT_DIRECTORY}/${PROJECT_README}" python3 "${PIPELINE_REPO_DIR}/stages/publish/s3_upload.py" --file "${PROJECT_LICENSE}" --bucket "${S3_REPORT_BUCKET}" --dest "${BASE_BUCKET_DIRECTORY}/${IMAGE_PATH}/${IMAGE_VERSION}/${REMOTE_REPORT_DIRECTORY}/${PROJECT_LICENSE}" -python3 "${PIPELINE_REPO_DIR}/stages/publish/s3_upload.py" --file "${REPORT_TAR_NAME}" --bucket "${S3_REPORT_BUCKET}" --dest "${BASE_BUCKET_DIRECTORY}/${IMAGE_PATH}/${IMAGE_VERSION}/${REMOTE_REPORT_DIRECTORY}/${REPORT_TAR_NAME}-${IMAGE_VERSION}-reports-signature.tar.gz" +python3 "${PIPELINE_REPO_DIR}/stages/publish/s3_upload.py" --file "${REPORT_TAR_NAME}" --bucket "${S3_REPORT_BUCKET}" --dest "${BASE_BUCKET_DIRECTORY}/${IMAGE_PATH}/${IMAGE_VERSION}/${REMOTE_REPORT_DIRECTORY}/${REPORT_TAR_NAME}"