@@ -31,10 +31,10 @@ functions:
31
31
- command : git.get_project
32
32
params :
33
33
directory : mongo-csharp-driver
34
- # Applies the subitted patch, if any
34
+ # Applies the submitted patch, if any
35
35
# Deprecated. Should be removed. But still needed for certain agents (ZAP)
36
36
- command : git.apply_patch
37
- # Make an evergreen exapanstion file with dynamic values
37
+ # Make an evergreen expansion file with dynamic values
38
38
- command : shell.exec
39
39
params :
40
40
working_dir : mongo-csharp-driver
@@ -46,6 +46,11 @@ functions:
46
46
CURRENT_VERSION=latest
47
47
fi
48
48
49
+ if [ "${PACKAGE_TARGET}" != "" ]; then
50
+ PACKAGE_VERSION=$(PACKAGE_TARGET="${PACKAGE_TARGET}" sh ./evergreen/packages-version.sh)
51
+ fi
52
+
53
+ export DOTNET_SDK_PATH="$(pwd)/../.dotnet"
49
54
export DRIVERS_TOOLS="$(pwd)/../drivers-tools"
50
55
51
56
if [ "Windows_NT" = "$OS" ]; then # Magic variable in cygwin
@@ -58,7 +63,9 @@ functions:
58
63
59
64
export MONGO_ORCHESTRATION_HOME="$DRIVERS_TOOLS/.evergreen/orchestration"
60
65
export MONGODB_BINARIES="$DRIVERS_TOOLS/mongodb/bin"
61
- export UPLOAD_BUCKET="${project}"
66
+ # revert this change before merging into master
67
+ # export UPLOAD_BUCKET="${project}"
68
+ export UPLOAD_BUCKET="dot-net-driver"
62
69
export PROJECT_DIRECTORY="$(pwd)"
63
70
64
71
cat <<EOT > expansion.yml
@@ -68,6 +75,8 @@ functions:
68
75
MONGODB_BINARIES: "$MONGODB_BINARIES"
69
76
UPLOAD_BUCKET: "$UPLOAD_BUCKET"
70
77
PROJECT_DIRECTORY: "$PROJECT_DIRECTORY"
78
+ PACKAGE_VERSION: "$PACKAGE_VERSION"
79
+ DOTNET_SDK_PATH: "$DOTNET_SDK_PATH"
71
80
PREPARE_SHELL: |
72
81
set -o errexit
73
82
set -o xtrace
@@ -76,14 +85,16 @@ functions:
76
85
export MONGODB_BINARIES="$MONGODB_BINARIES"
77
86
export UPLOAD_BUCKET="$UPLOAD_BUCKET"
78
87
export PROJECT_DIRECTORY="$PROJECT_DIRECTORY"
79
-
88
+ export PACKAGE_VERSION="$PACKAGE_VERSION"
80
89
export TMPDIR="$MONGO_ORCHESTRATION_HOME/db"
81
- export PATH="$MONGODB_BINARIES:$PATH"
90
+ export PATH="$DOTNET_SDK_PATH:$ MONGODB_BINARIES:$PATH"
82
91
export PROJECT="${project}"
83
92
EOT
84
93
# See what we've done
85
94
cat expansion.yml
86
95
96
+ # Do not output expansion.yml contents after this point
97
+
87
98
# Add CSFLE variables that shouldn't be output to the logs
88
99
cat <<EOT >> expansion.yml
89
100
PREPARE_CSFLE: |
@@ -97,13 +108,19 @@ functions:
97
108
export FLE_GCP_PRIVATE_KEY=${FLE_GCP_PRIVATE_KEY}
98
109
set -o xtrace # Enable tracing.
99
110
EOT
100
- # Do not output expansion.yml contents after this point
101
111
102
112
# Load the expansion file to make an evergreen variable with the current unique version
103
113
- command : expansions.update
104
114
params :
105
115
file : mongo-csharp-driver/expansion.yml
106
116
117
+ install-dotnet :
118
+ - command : shell.exec
119
+ params :
120
+ script : |
121
+ ${PREPARE_SHELL}
122
+ OS=${OS} sh ${PROJECT_DIRECTORY}/evergreen/install-dotnet.sh
123
+
107
124
prepare-resources :
108
125
- command : shell.exec
109
126
params :
@@ -1023,6 +1040,61 @@ functions:
1023
1040
${PREPARE_SHELL}
1024
1041
echo '{"results": [{ "status": "FAIL", "test_file": "Build", "log_raw": "No test-results.json found was created" } ]}' > ${PROJECT_DIRECTORY}/test-results.json
1025
1042
1043
+ packages-pack :
1044
+ - command : shell.exec
1045
+ params :
1046
+ working_dir : mongo-csharp-driver
1047
+ script : |
1048
+ ${PREPARE_SHELL}
1049
+ . ./evergreen/packages-pack.sh
1050
+
1051
+ packages-push :
1052
+ - command : shell.exec
1053
+ params :
1054
+ working_dir : mongo-csharp-driver
1055
+ env :
1056
+ PACKAGES_SOURCE : ${PACKAGES_SOURCE}
1057
+ PACKAGES_SOURCE_KEY : ${PACKAGES_SOURCE_KEY}
1058
+ script : |
1059
+ ${PREPARE_SHELL}
1060
+ . ./evergreen/packages-push.sh
1061
+
1062
+ upload-package :
1063
+ - command : s3.put
1064
+ params :
1065
+ aws_key : ${aws_key}
1066
+ aws_secret : ${aws_secret}
1067
+ local_file : ${PROJECT_DIRECTORY}/build/nuget/${PACKAGE_ID}.${PACKAGE_VERSION}.nupkg
1068
+ remote_file : ${UPLOAD_BUCKET}/${revision}/${PACKAGE_ID}.${PACKAGE_VERSION}.nupkg
1069
+ bucket : mciuploads
1070
+ permissions : public-read
1071
+ content_type : ${content_type|application/octet-stream}
1072
+ - command : s3.put
1073
+ params :
1074
+ aws_key : ${aws_key}
1075
+ aws_secret : ${aws_secret}
1076
+ local_file : ${PROJECT_DIRECTORY}/build/nuget/${PACKAGE_ID}.${PACKAGE_VERSION}.snupkg
1077
+ remote_file : ${UPLOAD_BUCKET}/${revision}/${PACKAGE_ID}.${PACKAGE_VERSION}.snupkg
1078
+ bucket : mciuploads
1079
+ permissions : public-read
1080
+ content_type : ${content_type|application/octet-stream}
1081
+
1082
+ download-package :
1083
+ - command : s3.get
1084
+ params :
1085
+ aws_key : ${aws_key}
1086
+ aws_secret : ${aws_secret}
1087
+ local_file : ${PROJECT_DIRECTORY}/build/nuget/${PACKAGE_ID}.${PACKAGE_VERSION}.nupkg
1088
+ remote_file : ${UPLOAD_BUCKET}/${revision}/${PACKAGE_ID}.${PACKAGE_VERSION}.nupkg
1089
+ bucket : mciuploads
1090
+ - command : s3.get
1091
+ params :
1092
+ aws_key : ${aws_key}
1093
+ aws_secret : ${aws_secret}
1094
+ local_file : ${PROJECT_DIRECTORY}/build/nuget/${PACKAGE_ID}.${PACKAGE_VERSION}.snupkg
1095
+ remote_file : ${UPLOAD_BUCKET}/${revision}/${PACKAGE_ID}.${PACKAGE_VERSION}.snupkg
1096
+ bucket : mciuploads
1097
+
1026
1098
pre :
1027
1099
- func : fetch-source
1028
1100
- func : prepare-resources
@@ -1040,7 +1112,6 @@ post:
1040
1112
- func : cleanup
1041
1113
1042
1114
tasks :
1043
-
1044
1115
- name : test-net472
1045
1116
commands :
1046
1117
- func : bootstrap-mongo-orchestration
@@ -1676,6 +1747,47 @@ tasks:
1676
1747
export GCPKMS_INSTANCENAME=${GCPKMS_INSTANCENAME}
1677
1748
GCPKMS_CMD="MONGODB_URI='mongodb://localhost:27017' ./evergreen/run-csfle-gcp-tests.sh" $DRIVERS_TOOLS/.evergreen/csfle/gcpkms/run-command.sh
1678
1749
1750
+ - name : packages-create
1751
+ commands :
1752
+ - func : packages-pack
1753
+ - func : upload-package
1754
+ vars :
1755
+ PACKAGE_ID : " MongoDB.Bson"
1756
+ - func : upload-package
1757
+ vars :
1758
+ PACKAGE_ID : " MongoDB.Driver"
1759
+ - func : upload-package
1760
+ vars :
1761
+ PACKAGE_ID : " MongoDB.Driver.Core"
1762
+ - func : upload-package
1763
+ vars :
1764
+ PACKAGE_ID : " MongoDB.Driver.GridFS"
1765
+ - func : upload-package
1766
+ vars :
1767
+ PACKAGE_ID : " mongocsharpdriver"
1768
+
1769
+ - name : packages-push
1770
+ commands :
1771
+ - func : download-package
1772
+ vars :
1773
+ PACKAGE_ID : " MongoDB.Bson"
1774
+ - func : download-package
1775
+ vars :
1776
+ PACKAGE_ID : " MongoDB.Driver"
1777
+ - func : download-package
1778
+ vars :
1779
+ PACKAGE_ID : " MongoDB.Driver.Core"
1780
+ - func : download-package
1781
+ vars :
1782
+ PACKAGE_ID : " MongoDB.Driver.GridFS"
1783
+ - func : download-package
1784
+ vars :
1785
+ PACKAGE_ID : " mongocsharpdriver"
1786
+ - func : packages-push
1787
+ vars :
1788
+ PACKAGES_SOURCE : " https://api.nuget.org/v3/index.json"
1789
+ PACKAGES_SOURCE_KEY : ${nuget_api_key}
1790
+
1679
1791
axes :
1680
1792
- id : version
1681
1793
display_name : MongoDB Version
@@ -1897,6 +2009,19 @@ task_groups:
1897
2009
tasks :
1898
2010
- test-csfle-with-gcp-kms
1899
2011
2012
+ - name : dev-package
2013
+ setup_task :
2014
+ - func : fetch-source
2015
+ vars :
2016
+ PACKAGE_TARGET : " dev"
2017
+ - func : prepare-resources
2018
+ - func : fix-absolute-paths
2019
+ - func : make-files-executable
2020
+ - func : install-dotnet
2021
+ tasks :
2022
+ - packages-create
2023
+ - packages-push
2024
+
1900
2025
buildvariants :
1901
2026
1902
2027
- matrix_name : " secure-tests"
@@ -2200,3 +2325,11 @@ buildvariants:
2200
2325
- name : test-smoke-tests-netcoreapp31
2201
2326
- name : test-smoke-tests-net50
2202
2327
- name : test-smoke-tests-net60
2328
+
2329
+ - name : dev-package-pack
2330
+ git_tag_only : true
2331
+ display_name : " Dev Package Pack"
2332
+ run_on : ubuntu1804-small
2333
+ tags : ["dev-package"]
2334
+ tasks :
2335
+ - name : dev-package
0 commit comments