Skip to content

Commit 972037d

Browse files
comandeo-mongocomandeo-mongo
committed
wip
1 parent 7fdf2a4 commit 972037d

File tree

12 files changed

+120
-151
lines changed

12 files changed

+120
-151
lines changed

‎.evergreen/config.yml‎

Lines changed: 26 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,8 @@ functions:
115115
export OCSP_CONNECTIVITY="${OCSP_CONNECTIVITY}"
116116
export OCSP_VERIFIER="${OCSP_VERIFIER}"
117117
118+
export DRIVER_TOOLS_CA_PEM=".mod/drivers-evergreen-tools/.evergreen/x509gen/ca.pem"
119+
118120
export RVM_RUBY="${RVM_RUBY}"
119121
EOT
120122
@@ -135,13 +137,14 @@ functions:
135137
set -x
136138
${PREPARE_SHELL}
137139
138-
MONGODB_VERSION=${VERSION} \
140+
MONGODB_VERSION=${MONGODB_VERSION} \
139141
TOPOLOGY=${TOPOLOGY} \
140142
AUTH=${AUTH} \
141143
SSL=${SSL} \
142144
ORCHESTRATION_FILE=${ORCHESTRATION_FILE} \
143145
REQUIRE_API_VERSION=${REQUIRE_API_VERSION} \
144146
LOAD_BALANCER=${LOAD_BALANCER} \
147+
REQUIRE_API_VERSION=${API_VERSION_REQUIRED}
145148
sh ${DRIVERS_TOOLS}/.evergreen/run-orchestration.sh
146149
- command: expansions.update
147150
params:
@@ -239,10 +242,10 @@ functions:
239242
params:
240243
shell: bash
241244
working_dir: "src"
245+
include_expansions_in_env: ["TOPOLOGY", "AUTH", "SSL", "MONGODB_URI"]
242246
script: |
243247
${PREPARE_SHELL}
244-
export CSOT_SPEC_TESTS=1
245-
TEST_CMD="bundle exec rspec spec/spec_tests/client_side_operations_timeout_spec.rb" \
248+
CSOT_SPEC_TESTS=1 TEST_CMD="bundle exec rspec spec/spec_tests/client_side_operations_timeout_spec.rb" \
246249
.evergreen/run-tests.sh
247250
248251
"export Kerberos credentials":
@@ -392,6 +395,7 @@ functions:
392395
params:
393396
shell: bash
394397
working_dir: "src"
398+
include_expansions_in_env: ["TOPOLOGY", "AUTH", "SSL", "MONGODB_URI"]
395399
script: |
396400
${PREPARE_SHELL}
397401
TEST_CMD="bundle exec rake driver_bench" PERFORMANCE_RESULTS_FILE="$PROJECT_DIRECTORY/perf.json" .evergreen/run-tests.sh
@@ -405,6 +409,7 @@ functions:
405409
params:
406410
shell: bash
407411
working_dir: "src"
412+
include_expansions_in_env: ["TOPOLOGY", "AUTH", "SSL", "MONGODB_URI"]
408413
script: |
409414
${PREPARE_SHELL}
410415
.evergreen/run-tests.sh
@@ -430,6 +435,18 @@ functions:
430435
.evergreen/run-tests-kerberos-unit.sh
431436
432437
"run Atlas tests":
438+
- command: ec2.assume_role
439+
params:
440+
role_arn: ${aws_test_secrets_role}
441+
# This creates secrets-export.sh, which is later sourced by run-tests.sh
442+
- command: subprocess.exec
443+
params:
444+
working_dir: "src"
445+
include_expansions_in_env: [AWS_SECRET_ACCESS_KEY, AWS_ACCESS_KEY_ID, AWS_SESSION_TOKEN]
446+
binary: bash
447+
args:
448+
- -c
449+
- ${DRIVERS_TOOLS}/.evergreen/secrets_handling/setup-secrets.sh drivers/atlas_connect
433450
- command: shell.exec
434451
type: test
435452
params:
@@ -812,19 +829,6 @@ axes:
812829
variables:
813830
MONGODB_VERSION: "4.4"
814831
CRYPT_SHARED_VERSION: "6.0.5"
815-
- id: "4.2"
816-
display_name: "4.2"
817-
variables:
818-
MONGODB_VERSION: "4.2"
819-
CRYPT_SHARED_VERSION: "6.0.5"
820-
- id: "4.0"
821-
display_name: "4.0"
822-
variables:
823-
MONGODB_VERSION: "4.0"
824-
- id: "3.6"
825-
display_name: "3.6"
826-
variables:
827-
MONGODB_VERSION: "3.6"
828832

829833
- id: fcv
830834
display_name: FCV
@@ -865,22 +869,22 @@ axes:
865869
display_name: Auth SSL
866870
variables:
867871
AUTH: "auth"
868-
SSL: "ssl"
872+
SSL: "yes"
869873
- id: "auth-and-nossl"
870874
display_name: Auth NoSSL
871875
variables:
872876
AUTH: "auth"
873877
- id: "noauth-and-ssl"
874878
display_name: NoAuth SSL
875879
variables:
876-
SSL: "ssl"
880+
SSL: "yes"
877881
- id: "noauth-and-nossl"
878882
display_name: NoAuth NoSSL
879883
- id: "x509"
880884
display_name: X.509
881885
variables:
882886
AUTH: "x509"
883-
SSL: "ssl"
887+
SSL: "yes"
884888
- id: kerberos
885889
display_name: Kerberos
886890
variables:
@@ -1227,25 +1231,15 @@ buildvariants:
12271231
ruby: ["ruby-3.3", "ruby-3.2", "jruby-9.4"]
12281232
mongodb-version: ['5.0']
12291233
topology: ["server", "replica_set", "sharded_cluster"]
1230-
os: ubuntu1804
1234+
os: ubuntu2004
12311235
display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
12321236
tasks:
12331237
- name: "test-main"
12341238

12351239
- matrix_name: "mongo-4.x"
12361240
matrix_spec:
12371241
ruby: ["ruby-3.0", "ruby-2.7"]
1238-
mongodb-version: ['4.4', '4.2', '4.0']
1239-
topology: ["server", "replica_set", "sharded_cluster"]
1240-
os: ubuntu1804
1241-
display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
1242-
tasks:
1243-
- name: "test-main"
1244-
1245-
- matrix_name: "mongo-3.6"
1246-
matrix_spec:
1247-
ruby: "ruby-2.7"
1248-
mongodb-version: ['3.6']
1242+
mongodb-version: ['4.4']
12491243
topology: ["server", "replica_set", "sharded_cluster"]
12501244
os: ubuntu1804
12511245
display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
@@ -1317,17 +1311,6 @@ buildvariants:
13171311
tasks:
13181312
- name: "test-main"
13191313

1320-
- matrix_name: mmapv1
1321-
matrix_spec:
1322-
ruby: "ruby-2.7"
1323-
mongodb-version: ['3.6', '4.0']
1324-
topology: ["server", "replica_set", "sharded_cluster"]
1325-
storage-engine: mmapv1
1326-
os: ubuntu1804
1327-
display_name: "${mongodb-version} ${topology} mmapv1 ${ruby}"
1328-
tasks:
1329-
- name: "test-main"
1330-
13311314
- matrix_name: "lint"
13321315
matrix_spec:
13331316
lint: on
@@ -1350,22 +1333,11 @@ buildvariants:
13501333
tasks:
13511334
- name: "test-main"
13521335

1353-
- matrix_name: "solo"
1354-
matrix_spec:
1355-
solo: on
1356-
ruby: ["ruby-3.3", "ruby-3.2", "ruby-3.1"]
1357-
mongodb-version: "8.0"
1358-
topology: ["server", "replica_set", "sharded_cluster"]
1359-
os: ubuntu2204
1360-
display_name: "${mongodb-version} ${topology} solo ${ruby}"
1361-
tasks:
1362-
- name: "test-main"
1363-
13641336
- matrix_name: "stress older"
13651337
matrix_spec:
13661338
stress: on
13671339
ruby: "ruby-2.7"
1368-
mongodb-version: ['4.2', '4.0', '3.6']
1340+
mongodb-version: ['4.4']
13691341
topology: replica_set
13701342
os: ubuntu1804
13711343
display_name: "${mongodb-version} ${topology} stress ${ruby}"

‎.evergreen/config/axes.yml.erb‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,6 @@ axes:
4040
variables:
4141
MONGODB_VERSION: "4.4"
4242
CRYPT_SHARED_VERSION: "6.0.5"
43-
- id: "4.2"
44-
display_name: "4.2"
45-
variables:
46-
MONGODB_VERSION: "4.2"
47-
CRYPT_SHARED_VERSION: "6.0.5"
48-
- id: "4.0"
49-
display_name: "4.0"
50-
variables:
51-
MONGODB_VERSION: "4.0"
52-
- id: "3.6"
53-
display_name: "3.6"
54-
variables:
55-
MONGODB_VERSION: "3.6"
5643

5744
- id: fcv
5845
display_name: FCV
@@ -93,22 +80,22 @@ axes:
9380
display_name: Auth SSL
9481
variables:
9582
AUTH: "auth"
96-
SSL: "ssl"
83+
SSL: "yes"
9784
- id: "auth-and-nossl"
9885
display_name: Auth NoSSL
9986
variables:
10087
AUTH: "auth"
10188
- id: "noauth-and-ssl"
10289
display_name: NoAuth SSL
10390
variables:
104-
SSL: "ssl"
91+
SSL: "yes"
10592
- id: "noauth-and-nossl"
10693
display_name: NoAuth NoSSL
10794
- id: "x509"
10895
display_name: X.509
10996
variables:
11097
AUTH: "x509"
111-
SSL: "ssl"
98+
SSL: "yes"
11299
- id: kerberos
113100
display_name: Kerberos
114101
variables:

‎.evergreen/config/common.yml.erb‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,8 @@ functions:
112112
export OCSP_CONNECTIVITY="${OCSP_CONNECTIVITY}"
113113
export OCSP_VERIFIER="${OCSP_VERIFIER}"
114114

115+
export DRIVER_TOOLS_CA_PEM=".mod/drivers-evergreen-tools/.evergreen/x509gen/ca.pem"
116+
115117
export RVM_RUBY="${RVM_RUBY}"
116118
EOT
117119

@@ -132,13 +134,14 @@ functions:
132134
set -x
133135
${PREPARE_SHELL}
134136

135-
MONGODB_VERSION=${VERSION} \
137+
MONGODB_VERSION=${MONGODB_VERSION} \
136138
TOPOLOGY=${TOPOLOGY} \
137139
AUTH=${AUTH} \
138140
SSL=${SSL} \
139141
ORCHESTRATION_FILE=${ORCHESTRATION_FILE} \
140142
REQUIRE_API_VERSION=${REQUIRE_API_VERSION} \
141143
LOAD_BALANCER=${LOAD_BALANCER} \
144+
REQUIRE_API_VERSION=${API_VERSION_REQUIRED}
142145
sh ${DRIVERS_TOOLS}/.evergreen/run-orchestration.sh
143146
- command: expansions.update
144147
params:
@@ -236,10 +239,10 @@ functions:
236239
params:
237240
shell: bash
238241
working_dir: "src"
242+
include_expansions_in_env: ["TOPOLOGY", "AUTH", "SSL", "MONGODB_URI"]
239243
script: |
240244
${PREPARE_SHELL}
241-
export CSOT_SPEC_TESTS=1
242-
TEST_CMD="bundle exec rspec spec/spec_tests/client_side_operations_timeout_spec.rb" \
245+
CSOT_SPEC_TESTS=1 TEST_CMD="bundle exec rspec spec/spec_tests/client_side_operations_timeout_spec.rb" \
243246
.evergreen/run-tests.sh
244247

245248
"export Kerberos credentials":
@@ -389,6 +392,7 @@ functions:
389392
params:
390393
shell: bash
391394
working_dir: "src"
395+
include_expansions_in_env: ["TOPOLOGY", "AUTH", "SSL", "MONGODB_URI"]
392396
script: |
393397
${PREPARE_SHELL}
394398
TEST_CMD="bundle exec rake driver_bench" PERFORMANCE_RESULTS_FILE="$PROJECT_DIRECTORY/perf.json" .evergreen/run-tests.sh
@@ -402,6 +406,7 @@ functions:
402406
params:
403407
shell: bash
404408
working_dir: "src"
409+
include_expansions_in_env: ["TOPOLOGY", "AUTH", "SSL", "MONGODB_URI"]
405410
script: |
406411
${PREPARE_SHELL}
407412
.evergreen/run-tests.sh
@@ -427,6 +432,18 @@ functions:
427432
.evergreen/run-tests-kerberos-unit.sh
428433

429434
"run Atlas tests":
435+
- command: ec2.assume_role
436+
params:
437+
role_arn: ${aws_test_secrets_role}
438+
# This creates secrets-export.sh, which is later sourced by run-tests.sh
439+
- command: subprocess.exec
440+
params:
441+
working_dir: "src"
442+
include_expansions_in_env: [AWS_SECRET_ACCESS_KEY, AWS_ACCESS_KEY_ID, AWS_SESSION_TOKEN]
443+
binary: bash
444+
args:
445+
- -c
446+
- ${DRIVERS_TOOLS}/.evergreen/secrets_handling/setup-secrets.sh drivers/atlas_connect
430447
- command: shell.exec
431448
type: test
432449
params:

‎.evergreen/config/standard.yml.erb‎

Lines changed: 4 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
recent_mdb = %w( 8.0 7.0 )
4040

41-
all_dbs = %w(latest 8.0 7.0 6.0 5.0 4.4 4.2 4.0 3.6)
41+
all_dbs = %w(latest 8.0 7.0 6.0 5.0 4.4)
4242
%>
4343

4444
buildvariants:
@@ -88,25 +88,15 @@ buildvariants:
8888
ruby: <%= recent_rubies %>
8989
mongodb-version: ['5.0']
9090
topology: <%= topologies %>
91-
os: ubuntu1804
91+
os: ubuntu2004
9292
display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
9393
tasks:
9494
- name: "test-main"
9595

9696
- matrix_name: "mongo-4.x"
9797
matrix_spec:
9898
ruby: <%= older_rubies %>
99-
mongodb-version: ['4.4', '4.2', '4.0']
100-
topology: <%= topologies %>
101-
os: ubuntu1804
102-
display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
103-
tasks:
104-
- name: "test-main"
105-
106-
- matrix_name: "mongo-3.6"
107-
matrix_spec:
108-
ruby: <%= supported_mri_ruby_2 %>
109-
mongodb-version: ['3.6']
99+
mongodb-version: ['4.4']
110100
topology: <%= topologies %>
111101
os: ubuntu1804
112102
display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
@@ -178,17 +168,6 @@ buildvariants:
178168
tasks:
179169
- name: "test-main"
180170

181-
- matrix_name: mmapv1
182-
matrix_spec:
183-
ruby: <%= supported_mri_ruby_2 %>
184-
mongodb-version: ['3.6', '4.0']
185-
topology: <%= topologies %>
186-
storage-engine: mmapv1
187-
os: ubuntu1804
188-
display_name: "${mongodb-version} ${topology} mmapv1 ${ruby}"
189-
tasks:
190-
- name: "test-main"
191-
192171
- matrix_name: "lint"
193172
matrix_spec:
194173
lint: on
@@ -211,22 +190,11 @@ buildvariants:
211190
tasks:
212191
- name: "test-main"
213192

214-
- matrix_name: "solo"
215-
matrix_spec:
216-
solo: on
217-
ruby: <%= supported_mri_rubies_3_ubuntu %>
218-
mongodb-version: <%= latest_stable_mdb %>
219-
topology: <%= topologies %>
220-
os: ubuntu2204
221-
display_name: "${mongodb-version} ${topology} solo ${ruby}"
222-
tasks:
223-
- name: "test-main"
224-
225193
- matrix_name: "stress older"
226194
matrix_spec:
227195
stress: on
228196
ruby: <%= supported_mri_ruby_2 %>
229-
mongodb-version: ['4.2', '4.0', '3.6']
197+
mongodb-version: ['4.4']
230198
topology: replica_set
231199
os: ubuntu1804
232200
display_name: "${mongodb-version} ${topology} stress ${ruby}"

0 commit comments

Comments
 (0)