From 88446201162d3570c9c820a55bf2ec2537aa485e Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Tue, 3 Dec 2019 12:06:51 -0800 Subject: [PATCH] Change s3 key prefix --- .github/workflows/master_build.yml | 2 +- tools/ci-scripts/upload.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/master_build.yml b/.github/workflows/master_build.yml index 4592f8882a..b4c3561ac8 100644 --- a/.github/workflows/master_build.yml +++ b/.github/workflows/master_build.yml @@ -107,7 +107,7 @@ jobs: shell: bash id: buildenv1 run: | - echo ::set-env name=UPLOAD_PREFIX::master/$RELEASE_NUMBER + echo ::set-env name=UPLOAD_PREFIX::master echo ::set-env name=GIT_COMMIT_SHORT::`echo $GIT_COMMIT | cut -c1-7` # Linux build variables if [ "${{ matrix.os }}" = "ubuntu-latest" ]; then diff --git a/tools/ci-scripts/upload.py b/tools/ci-scripts/upload.py index cfeff2ae05..c83cde03e7 100644 --- a/tools/ci-scripts/upload.py +++ b/tools/ci-scripts/upload.py @@ -10,13 +10,15 @@ from github import Github def main(): bucket_name = os.environ['BUCKET_NAME'] upload_prefix = os.environ['UPLOAD_PREFIX'] + release_number = os.environ['RELEASE_NUMBER'] + full_prefix = upload_prefix + '/' + release_number[0:-2] + '/' + release_number + '/' S3 = boto3.client('s3') path = os.path.join(os.getcwd(), os.environ['ARTIFACT_PATTERN']) files = glob.glob(path, recursive=False) for archiveFile in files: filePath, fileName = os.path.split(archiveFile) - S3.upload_file(os.path.join(filePath, fileName), bucket_name, upload_prefix + '/' + fileName) - print("Uploaded Artifact to S3: https://{}.s3-us-west-2.amazonaws.com/{}/{}".format(bucket_name, upload_prefix, fileName)) + S3.upload_file(os.path.join(filePath, fileName), bucket_name, full_prefix + '/' + fileName) + print("Uploaded Artifact to S3: https://{}.s3-us-west-2.amazonaws.com/{}/{}".format(bucket_name, full_prefix, fileName)) print("Finished") main()