Skip to content

Commit

Permalink
Merge #136338
Browse files Browse the repository at this point in the history
136338: build/roachtest: upload stats after upload binaries r=nameisbhaskar a=sambhav-jain-16

When openmetrics are enabled in roachtest, we use a different service account in `upload_stats` to upload to a bucket in `cockroach-testeng-infra` rather than `cockroach-ephemeral`.
```
+ gsutil cp bin/roachprod gs://cockroach-nightly/binaries/master/linux/amd64/roachprod.b6bfe7ba6e74af63bbb7a774fe6e3f96a13eca80
04:22:20   AccessDeniedException: 403 [email protected] does not have storage.objects.list access to the Google Cloud Storage bucket. Permission 'storage.objects.list' denied on resource (or it may not exist).
```
Currently since `upload_binaries` run afterwards, it fails since the nightly bucket in present in `cockroach-ephemeral`. 

One simple solution is to swap the order of execution so that the binaries are uploaded before stats since the order doesn't really matter. 
Epic: none

Release note: None

Co-authored-by: Sambhav Jain <[email protected]>
  • Loading branch information
craig[bot] and sambhav-jain-16 committed Nov 28, 2024
2 parents f2ce52f + 7fe4b86 commit 4e677e4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion build/teamcity/util/roachtest_util.sh
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@ function upload_binaries {
}

function upload_all {
upload_stats
upload_binaries
upload_stats
}

# Upload any ${stats_file_name} we can find, and some binaries, no matter what happens.
Expand Down

0 comments on commit 4e677e4

Please sign in to comment.