Skip to content

Commit 2f6832c

Browse files
committed
Use a new S3 bucket instead of mciuploads
This is being done for two reasons. First, we want to move projects away from all using the shared `mciuploads` bucket. Second, the credentials to access `mciuploads` are only available for the DB Tools Evergreen project for the `master` branch. When we make a PR off a different branch, we cannot see those credentials. That means those branches cannot interact with S3 in CI, which leads to lots of CI failures. Switching to a new bucket and using `ec2.assume_role` to access that bucket means this works on any branch.
1 parent 8202f34 commit 2f6832c

2 files changed

Lines changed: 71 additions & 79 deletions

File tree

common.yml

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -265,8 +265,7 @@ functions:
265265
# upload individual release artifacts to task page
266266
- command: s3.put
267267
params:
268-
aws_key: ${aws_key}
269-
aws_secret: ${aws_secret}
268+
role_arn: arn:aws:iam::391144487543:role/evergreen-project-mongo-tools
270269
local_files_include_filter:
271270
- src/github.com/mongodb/mongo-tools/mongodb-database-tools*.deb
272271
- src/github.com/mongodb/mongo-tools/mongodb-database-tools*.msi
@@ -275,8 +274,7 @@ functions:
275274
- src/github.com/mongodb/mongo-tools/mongodb-database-tools*.zip
276275
remote_file: mongo-tools/pkgs/${build_id}/
277276
content_type: application/octet-stream
278-
bucket: mciuploads
279-
permissions: public-read
277+
bucket: evergreen-project-mongo-tools-i6qg5nn6nbm
280278
display_name: "Release Artifact - "
281279

282280
# pack all release artifacts into a tarball and upload them to one
@@ -291,25 +289,23 @@ functions:
291289
- mongodb-database-tools*.rpm
292290
- mongodb-database-tools*.tgz
293291
- mongodb-database-tools*.zip
292+
294293
- command: s3.put
295294
params:
296-
aws_key: ${aws_key}
297-
aws_secret: ${aws_secret}
295+
role_arn: arn:aws:iam::391144487543:role/evergreen-project-mongo-tools
298296
local_file: src/github.com/mongodb/mongo-tools/upload.tgz
299297
remote_file: mongo-tools/task/dist/${build_id}/all-release-artifacts.tgz
300298
content_type: application/x-gzip
301-
bucket: mciuploads
302-
permissions: public-read
299+
bucket: evergreen-project-mongo-tools-i6qg5nn6nbm
303300
display_name: All Release Artifacts (.tgz)
304301

305302
"fetch dist release artifacts":
306303
- command: s3.get
307304
params:
308-
aws_key: ${aws_key}
309-
aws_secret: ${aws_secret}
305+
role_arn: arn:aws:iam::391144487543:role/evergreen-project-mongo-tools
310306
remote_file: mongo-tools/task/dist/${build_id}/all-release-artifacts.tgz
311307
extract_to: src/github.com/mongodb/mongo-tools/
312-
bucket: mciuploads
308+
bucket: evergreen-project-mongo-tools-i6qg5nn6nbm
313309

314310
"sign artifacts":
315311
command: shell.exec
@@ -335,10 +331,10 @@ functions:
335331
working_dir: src/github.com/mongodb/mongo-tools
336332
script: |
337333
rm -rf ./mongorestore/testdata/longcollectionname/
334+
338335
- command: s3.put
339336
params:
340-
aws_key: ${aws_key}
341-
aws_secret: ${aws_secret}
337+
role_arn: arn:aws:iam::391144487543:role/evergreen-project-mongo-tools
342338
local_files_include_filter:
343339
- src/github.com/mongodb/mongo-tools/mongodb-database-tools*.sig
344340
- src/github.com/mongodb/mongo-tools/mongodb-database-tools*.deb
@@ -347,8 +343,7 @@ functions:
347343
- src/github.com/mongodb/mongo-tools/mongodb-database-tools*.tgz
348344
- src/github.com/mongodb/mongo-tools/mongodb-database-tools*.zip
349345
remote_file: mongo-tools/task/sign/${build_id}/
350-
bucket: mciuploads
351-
permissions: public-read
346+
bucket: evergreen-project-mongo-tools-i6qg5nn6nbm
352347
content_type: application/octet-stream
353348

354349
"upload release packages to s3":
@@ -366,16 +361,15 @@ functions:
366361
script: |
367362
${_set_shell_env}
368363
go run release/release.go upload-json
364+
369365
- command: s3.put
370366
params:
371-
aws_key: ${aws_key}
372-
aws_secret: ${aws_secret}
367+
role_arn: arn:aws:iam::391144487543:role/evergreen-project-mongo-tools
373368
local_file: src/github.com/mongodb/mongo-tools/release.json
374369
remote_file: mongo-tools/release/${build_id}/
375370
optional: true
376371
content_type: application/json
377-
bucket: mciuploads
378-
permissions: public-read
372+
bucket: evergreen-project-mongo-tools-i6qg5nn6nbm
379373

380374
"generate full JSON feed":
381375
- command: shell.exec

0 commit comments

Comments
 (0)