@@ -81,7 +81,7 @@ functions:
8181 - command : s3.put
8282 params :
8383 role_arn : ${upload_arn}
84- remote_file : ' ${project} /${build_variant}/${branch_name}/${libmongocrypt_s3_suffix}/libmongocrypt.tar.gz'
84+ remote_file : ' libmongocrypt /${build_variant}/${branch_name}/${libmongocrypt_s3_suffix}/libmongocrypt.tar.gz'
8585 bucket : ${upload_bucket}
8686 permissions : private
8787 visibility : signed
@@ -90,7 +90,7 @@ functions:
9090 - command : s3.put
9191 params :
9292 role_arn : ${upload_arn}
93- remote_file : ' ${project} /${build_variant}/${branch_name}/${libmongocrypt_s3_suffix_copy}/libmongocrypt.tar.gz'
93+ remote_file : ' libmongocrypt /${build_variant}/${branch_name}/${libmongocrypt_s3_suffix_copy}/libmongocrypt.tar.gz'
9494 bucket : ${upload_bucket}
9595 permissions : private
9696 visibility : signed
@@ -139,7 +139,7 @@ functions:
139139 - command : s3.put
140140 params :
141141 role_arn : ${upload_arn}
142- remote_file : ' ${project} /${build_variant}/${branch_name}/${libmongocrypt_s3_suffix}/libmongocrypt-distro-packages.tar.gz'
142+ remote_file : ' libmongocrypt /${build_variant}/${branch_name}/${libmongocrypt_s3_suffix}/libmongocrypt-distro-packages.tar.gz'
143143 bucket : ${upload_bucket}
144144 permissions : private
145145 visibility : signed
@@ -225,7 +225,7 @@ functions:
225225 - command : s3.get
226226 params :
227227 role_arn : ${upload_arn}
228- remote_file : ' ${project} /${variant_name}/${branch_name}/${libmongocrypt_s3_suffix}/libmongocrypt.tar.gz'
228+ remote_file : ' libmongocrypt /${variant_name}/${branch_name}/${libmongocrypt_s3_suffix}/libmongocrypt.tar.gz'
229229 bucket : ${upload_bucket}
230230 extract_to : all/${variant_name}
231231
@@ -329,7 +329,7 @@ functions:
329329 params :
330330 role_arn : ${upload_arn}
331331 local_file : release-files.tgz
332- remote_file : ' ${project} /python-release/${branch_name}/${libmongocrypt_s3_suffix}/${task_id}-${execution}-release-files.tar.gz'
332+ remote_file : ' libmongocrypt /python-release/${branch_name}/${libmongocrypt_s3_suffix}/${task_id}-${execution}-release-files.tar.gz'
333333 bucket : ${upload_bucket}
334334 permissions : private
335335 visibility : signed
@@ -381,7 +381,7 @@ functions:
381381 params :
382382 role_arn : ${upload_arn}
383383 local_file : release-files-all.tgz
384- remote_file : ' ${project} /python-release/${branch_name}/${libmongocrypt_s3_suffix}/${task_id}-${execution}-release-files-all.tar.gz'
384+ remote_file : ' libmongocrypt /python-release/${branch_name}/${libmongocrypt_s3_suffix}/${task_id}-${execution}-release-files-all.tar.gz'
385385 # The merged results are placed in the CDN bucket for releases
386386 bucket : ${upload_bucket}
387387 permissions : private
@@ -442,7 +442,7 @@ functions:
442442 local_file : libmongocrypt/cyclonedx.augmented.sbom.json
443443 permissions : private
444444 visibility : signed
445- remote_file : ${project} /${build_variant}/${branch_name}/${libmongocrypt_s3_suffix}/sbom/cyclonedx.augmented.sbom.json
445+ remote_file : libmongocrypt /${build_variant}/${branch_name}/${libmongocrypt_s3_suffix}/sbom/cyclonedx.augmented.sbom.json
446446
447447tasks :
448448- name : build-and-test-and-upload
@@ -936,7 +936,7 @@ tasks:
936936 - command : s3.get # Download Windows build.
937937 params :
938938 role_arn : ${upload_arn}
939- remote_file : ' ${project} /windows-test/${branch_name}/${libmongocrypt_s3_suffix}/libmongocrypt.tar.gz'
939+ remote_file : ' libmongocrypt /windows-test/${branch_name}/${libmongocrypt_s3_suffix}/libmongocrypt.tar.gz'
940940 bucket : ${upload_bucket}
941941 extract_to : libmongocrypt_download
942942 - command : shell.exec
@@ -974,7 +974,7 @@ tasks:
974974 - command : s3.put # Upload tarball for GitHub Release.
975975 params :
976976 role_arn : ${upload_arn}
977- remote_file : ' ${project} /${build_variant}/${branch_name}/${revision}/${version_id}/libmongocrypt-windows-x86_64-${libmongocrypt_release_version}.tar.gz'
977+ remote_file : ' libmongocrypt /${build_variant}/${branch_name}/${revision}/${version_id}/libmongocrypt-windows-x86_64-${libmongocrypt_release_version}.tar.gz'
978978 display_name : libmongocrypt-windows-x86_64-${libmongocrypt_release_version}.tar.gz
979979 bucket : ${upload_bucket}
980980 permissions : private
@@ -994,7 +994,7 @@ tasks:
994994 - command : s3.put # Upload signature for GitHub Release.
995995 params :
996996 role_arn : ${upload_arn}
997- remote_file : ' ${project} /${build_variant}/${branch_name}/${revision}/${version_id}/libmongocrypt-windows-x86_64-${libmongocrypt_release_version}.asc'
997+ remote_file : ' libmongocrypt /${build_variant}/${branch_name}/${revision}/${version_id}/libmongocrypt-windows-x86_64-${libmongocrypt_release_version}.asc'
998998 display_name : libmongocrypt-windows-x86_64-${libmongocrypt_release_version}.asc
999999 bucket : ${upload_bucket}
10001000 permissions : private
@@ -1149,9 +1149,11 @@ pre:
11491149 # CDN S3 bucket. Otherwise, we upload to a less restricted bucket for convenience. The corresponding
11501150 # role_arn_... values come from EVG project configuration variables stored on the EVG server
11511151 if test "${is_patch}" = 'true' || "${project}" != 'libmongocrypt-release'; then
1152+ echo "Using upload bucket: mciuploads"
11521153 upload_bucket='mciuploads'
11531154 upload_arn='${role_arn_for_mciuploads}'
11541155 else
1156+ echo "Using upload bucket: cdn-origin-libmongocrypt"
11551157 upload_bucket='cdn-origin-libmongocrypt'
11561158 upload_arn='${role_arn_for_release}'
11571159 fi
0 commit comments