Skip to content

Commit 67b17d3

Browse files
sanych-sunsanych-sun
authored
CSHARP-6039: Implement a new EG variable to override the default UPLOAD_BUCKET path (#1999)
1 parent a8d74c7 commit 67b17d3

1 file changed

Lines changed: 13 additions & 18 deletions

File tree

‎evergreen/evergreen.yml‎

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,13 @@ functions:
6161
6262
export MONGO_ORCHESTRATION_HOME="$DRIVERS_TOOLS/.evergreen/orchestration"
6363
export MONGODB_BINARIES="$DRIVERS_TOOLS/mongodb/bin"
64-
export UPLOAD_BUCKET="${project}"
6564
export PROJECT_DIRECTORY="$(pwd)"
6665
6766
cat <<EOT > expansion.yml
6867
CURRENT_VERSION: "$CURRENT_VERSION"
6968
DRIVERS_TOOLS: "$DRIVERS_TOOLS"
7069
MONGO_ORCHESTRATION_HOME: "$MONGO_ORCHESTRATION_HOME"
7170
MONGODB_BINARIES: "$MONGODB_BINARIES"
72-
UPLOAD_BUCKET: "$UPLOAD_BUCKET"
7371
PROJECT_DIRECTORY: "$PROJECT_DIRECTORY"
7472
PACKAGE_VERSION: "$PACKAGE_VERSION"
7573
DOTNET_ROOT: "$DOTNET_ROOT"
@@ -79,7 +77,6 @@ functions:
7977
export DRIVERS_TOOLS="$DRIVERS_TOOLS"
8078
export MONGO_ORCHESTRATION_HOME="$MONGO_ORCHESTRATION_HOME"
8179
export MONGODB_BINARIES="$MONGODB_BINARIES"
82-
export UPLOAD_BUCKET="$UPLOAD_BUCKET"
8380
export PROJECT_DIRECTORY="$PROJECT_DIRECTORY"
8481
export PACKAGE_VERSION="$PACKAGE_VERSION"
8582
export TMPDIR="$MONGO_ORCHESTRATION_HOME/db"
@@ -138,7 +135,6 @@ functions:
138135
# Compress and upload the entire build directory
139136
- command: archive.targz_pack
140137
params:
141-
# Example: mongo_c_driver_releng_9dfb7d741efbca16faa7859b9349d7a942273e43_16_11_08_19_29_52.tar.gz
142138
target: "${build_id}.tar.gz"
143139
source_dir: ${PROJECT_DIRECTORY}/
144140
include:
@@ -148,8 +144,7 @@ functions:
148144
aws_key: ${aws_key}
149145
aws_secret: ${aws_secret}
150146
local_file: ${build_id}.tar.gz
151-
# Example: /mciuploads/${UPLOAD_BUCKET}/gcc49/9dfb7d741efbca16faa7859b9349d7a942273e43/debug-compile-nosasl-nossl/mongo_c_driver_releng_9dfb7d741efbca16faa7859b9349d7a942273e43_16_11_08_19_29_52.tar.gz
152-
remote_file: ${UPLOAD_BUCKET}/${build_variant}/${revision}/${task_name}/${build_id}.tar.gz
147+
remote_file: ${upload_prefix}${build_variant}/${revision}/${task_name}/${build_id}.tar.gz
153148
bucket: mciuploads
154149
permissions: public-read
155150
content_type: ${content_type|application/x-gzip}
@@ -181,7 +176,7 @@ functions:
181176
aws_key: ${aws_key}
182177
aws_secret: ${aws_secret}
183178
local_file: mongodb-logs.tar.gz
184-
remote_file: ${UPLOAD_BUCKET}/${build_variant}/${revision}/${version_id}/${build_id}/logs/${task_id}-${execution}-mongodb-logs.tar.gz
179+
remote_file: ${upload_prefix}${build_variant}/${revision}/${version_id}/${build_id}/logs/${task_id}-${execution}-mongodb-logs.tar.gz
185180
bucket: mciuploads
186181
permissions: public-read
187182
content_type: ${content_type|application/x-gzip}
@@ -191,7 +186,7 @@ functions:
191186
aws_key: ${aws_key}
192187
aws_secret: ${aws_secret}
193188
local_file: drivers-tools/.evergreen/orchestration/server.log
194-
remote_file: ${UPLOAD_BUCKET}/${build_variant}/${revision}/${version_id}/${build_id}/logs/${task_id}-${execution}-orchestration.log
189+
remote_file: ${upload_prefix}${build_variant}/${revision}/${version_id}/${build_id}/logs/${task_id}-${execution}-orchestration.log
195190
bucket: mciuploads
196191
permissions: public-read
197192
content_type: ${content_type|text/plain}
@@ -891,7 +886,7 @@ functions:
891886
local_files_include_filter:
892887
- mongo-csharp-driver/artifacts/nuget/*.${PACKAGE_VERSION}.nupkg
893888
- mongo-csharp-driver/artifacts/nuget/*.${PACKAGE_VERSION}.snupkg
894-
remote_file: ${UPLOAD_BUCKET}/${revision}/
889+
remote_file: ${upload_prefix}${revision}/
895890
preserve_path: false
896891
bucket: mciuploads
897892
permissions: public-read
@@ -903,56 +898,56 @@ functions:
903898
aws_key: ${aws_key}
904899
aws_secret: ${aws_secret}
905900
local_file: mongo-csharp-driver/artifacts/nuget/MongoDB.Bson.${PACKAGE_VERSION}.nupkg
906-
remote_file: ${UPLOAD_BUCKET}/${revision}/MongoDB.Bson.${PACKAGE_VERSION}.nupkg
901+
remote_file: ${upload_prefix}${revision}/MongoDB.Bson.${PACKAGE_VERSION}.nupkg
907902
bucket: mciuploads
908903
- command: s3.get
909904
params:
910905
aws_key: ${aws_key}
911906
aws_secret: ${aws_secret}
912907
local_file: mongo-csharp-driver/artifacts/nuget/MongoDB.Bson.${PACKAGE_VERSION}.snupkg
913-
remote_file: ${UPLOAD_BUCKET}/${revision}/MongoDB.Bson.${PACKAGE_VERSION}.snupkg
908+
remote_file: ${upload_prefix}${revision}/MongoDB.Bson.${PACKAGE_VERSION}.snupkg
914909
bucket: mciuploads
915910
- command: s3.get
916911
params:
917912
aws_key: ${aws_key}
918913
aws_secret: ${aws_secret}
919914
local_file: mongo-csharp-driver/artifacts/nuget/MongoDB.Driver.${PACKAGE_VERSION}.nupkg
920-
remote_file: ${UPLOAD_BUCKET}/${revision}/MongoDB.Driver.${PACKAGE_VERSION}.nupkg
915+
remote_file: ${upload_prefix}${revision}/MongoDB.Driver.${PACKAGE_VERSION}.nupkg
921916
bucket: mciuploads
922917
- command: s3.get
923918
params:
924919
aws_key: ${aws_key}
925920
aws_secret: ${aws_secret}
926921
local_file: mongo-csharp-driver/artifacts/nuget/MongoDB.Driver.${PACKAGE_VERSION}.snupkg
927-
remote_file: ${UPLOAD_BUCKET}/${revision}/MongoDB.Driver.${PACKAGE_VERSION}.snupkg
922+
remote_file: ${upload_prefix}${revision}/MongoDB.Driver.${PACKAGE_VERSION}.snupkg
928923
bucket: mciuploads
929924
- command: s3.get
930925
params:
931926
aws_key: ${aws_key}
932927
aws_secret: ${aws_secret}
933928
local_file: mongo-csharp-driver/artifacts/nuget/MongoDB.Driver.Authentication.AWS.${PACKAGE_VERSION}.nupkg
934-
remote_file: ${UPLOAD_BUCKET}/${revision}/MongoDB.Driver.Authentication.AWS.${PACKAGE_VERSION}.nupkg
929+
remote_file: ${upload_prefix}${revision}/MongoDB.Driver.Authentication.AWS.${PACKAGE_VERSION}.nupkg
935930
bucket: mciuploads
936931
- command: s3.get
937932
params:
938933
aws_key: ${aws_key}
939934
aws_secret: ${aws_secret}
940935
local_file: mongo-csharp-driver/artifacts/nuget/MongoDB.Driver.Authentication.AWS.${PACKAGE_VERSION}.snupkg
941-
remote_file: ${UPLOAD_BUCKET}/${revision}/MongoDB.Driver.Authentication.AWS.${PACKAGE_VERSION}.snupkg
936+
remote_file: ${upload_prefix}${revision}/MongoDB.Driver.Authentication.AWS.${PACKAGE_VERSION}.snupkg
942937
bucket: mciuploads
943938
- command: s3.get
944939
params:
945940
aws_key: ${aws_key}
946941
aws_secret: ${aws_secret}
947942
local_file: mongo-csharp-driver/artifacts/nuget/MongoDB.Driver.Encryption.${PACKAGE_VERSION}.nupkg
948-
remote_file: ${UPLOAD_BUCKET}/${revision}/MongoDB.Driver.Encryption.${PACKAGE_VERSION}.nupkg
943+
remote_file: ${upload_prefix}${revision}/MongoDB.Driver.Encryption.${PACKAGE_VERSION}.nupkg
949944
bucket: mciuploads
950945
- command: s3.get
951946
params:
952947
aws_key: ${aws_key}
953948
aws_secret: ${aws_secret}
954949
local_file: mongo-csharp-driver/artifacts/nuget/MongoDB.Driver.Encryption.${PACKAGE_VERSION}.snupkg
955-
remote_file: ${UPLOAD_BUCKET}/${revision}/MongoDB.Driver.Encryption.${PACKAGE_VERSION}.snupkg
950+
remote_file: ${upload_prefix}${revision}/MongoDB.Driver.Encryption.${PACKAGE_VERSION}.snupkg
956951
bucket: mciuploads
957952

958953
build-apidocs:
@@ -2454,7 +2449,7 @@ task_groups:
24542449
aws_secret: ${aws_secret}
24552450
local_files_include_filter:
24562451
- mongo-csharp-driver/artifacts/apicompat/*.${PACKAGE_VERSION}.txt
2457-
remote_file: ${UPLOAD_BUCKET}/${revision}/
2452+
remote_file: ${upload_prefix}${revision}/
24582453
preserve_path: false
24592454
bucket: mciuploads
24602455
permissions: public-read

0 commit comments

Comments
 (0)