Skip to content

Commit 78795dd

Browse files
MONGOID-5904 Use new toolchain (mongodb#6056) (mongodb#6057)
1 parent 1913bb3 commit 78795dd

File tree

8 files changed

+211
-232
lines changed

8 files changed

+211
-232
lines changed

.evergreen/config.yml

Lines changed: 85 additions & 101 deletions
Large diffs are not rendered by default.

.evergreen/config/axes.yml.erb

Lines changed: 21 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -5,56 +5,59 @@ axes:
55
- id: "latest"
66
display_name: "MongoDB Latest"
77
variables:
8-
VERSION: "latest"
8+
MONGODB_VERSION: "latest"
9+
- id: "8.0"
10+
display_name: "MongoDB 8.0"
11+
variables:
12+
MONGODB_VERSION: "8.0"
913
- id: "7.0"
1014
display_name: "MongoDB 7.0"
1115
variables:
12-
VERSION: "7.0"
16+
MONGODB_VERSION: "7.0"
1317
- id: "6.0"
1418
display_name: "MongoDB 6.0"
1519
variables:
16-
VERSION: "6.0"
20+
MONGODB_VERSION: "6.0"
1721
- id: "5.3"
1822
display_name: "MongoDB 5.3"
1923
variables:
20-
VERSION: "5.3"
24+
MONGODB_VERSION: "5.3"
2125
- id: "5.0"
2226
display_name: "MongoDB 5.0"
2327
variables:
24-
VERSION: "5.0"
28+
MONGODB_VERSION: "5.0"
2529
- id: "4.4"
2630
display_name: "MongoDB 4.4"
2731
variables:
28-
VERSION: "4.4"
32+
MONGODB_VERSION: "4.4"
2933
- id: "4.2"
3034
display_name: "MongoDB 4.2"
3135
variables:
32-
VERSION: "4.2"
36+
MONGODB_VERSION: "4.2"
3337
- id: "4.0"
3438
display_name: "MongoDB 4.0"
3539
variables:
36-
VERSION: "4.0"
40+
MONGODB_VERSION: "4.0"
3741
- id: "3.6"
3842
display_name: "MongoDB 3.6"
3943
variables:
40-
VERSION: "3.6"
44+
MONGODB_VERSION: "3.6"
4145

4246
- id: "topology"
4347
display_name: Topology
4448
values:
45-
- id: "standalone"
49+
- id: "server"
4650
display_name: Standalone
4751
variables:
48-
TOPOLOGY: "standalone"
49-
- id: "replica-set"
52+
TOPOLOGY: "server"
53+
- id: "replica_set"
5054
display_name: Replica Set
5155
variables:
52-
TOPOLOGY: "replica-set"
53-
- id: "sharded-cluster"
56+
TOPOLOGY: "replica_set"
57+
- id: "sharded_cluster"
5458
display_name: Sharded Cluster
5559
variables:
56-
TOPOLOGY: "sharded-cluster"
57-
SINGLE_MONGOS: true
60+
TOPOLOGY: "sharded_cluster"
5861

5962
- id: "auth"
6063
display_name: Authentication
@@ -71,7 +74,7 @@ axes:
7174
- id: "ssl"
7275
display_name: SSL
7376
values:
74-
- id: "ssl"
77+
- id: "yes"
7578
display_name: SSL
7679
variables:
7780
SSL: "ssl"
@@ -119,34 +122,12 @@ axes:
119122
- id: "os"
120123
display_name: OS
121124
values:
122-
- id: actual-ubuntu-22.04
125+
- id: ubuntu-22.04
123126
display_name: "Ubuntu 22.04"
124127
run_on: ubuntu2204-small
125-
- id: ubuntu-18.04
126-
display_name: "Ubuntu 18.04"
127-
run_on: ubuntu2004-small
128-
variables:
129-
DOCKER_DISTRO: ubuntu1804
130128
- id: ubuntu-20.04
131129
display_name: "Ubuntu 20.04"
132130
run_on: ubuntu2004-small
133-
variables:
134-
DOCKER_DISTRO: ubuntu2004
135-
- id: ubuntu-22.04
136-
display_name: "Ubuntu 22.04"
137-
run_on: ubuntu2004-small
138-
variables:
139-
DOCKER_DISTRO: ubuntu2204
140-
- id: debian11
141-
display_name: "Debian 11"
142-
run_on: ubuntu2004-small
143-
variables:
144-
DOCKER_DISTRO: debian11
145-
- id: rhel80
146-
display_name: "RHEL 8.0"
147-
run_on: ubuntu2004-small
148-
variables:
149-
DOCKER_DISTRO: rhel80
150131

151132
- id: "driver"
152133
display_name: Driver Version

.evergreen/config/commands.yml.erb

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ functions:
5252
export PATH="$MONGODB_BINARIES:$PATH"
5353
export PROJECT="${project}"
5454

55-
export MONGODB_VERSION="${VERSION}"
55+
export MONGODB_VERSION="${MONGODB_VERSION}"
5656
export TOPOLOGY="${TOPOLOGY}"
5757
export SINGLE_MONGOS="${SINGLE_MONGOS}"
5858
export AUTH="${AUTH}"
@@ -73,6 +73,24 @@ functions:
7373
params:
7474
file: src/expansion.yml
7575

76+
bootstrap-mongo-orchestration:
77+
- command: shell.exec
78+
params:
79+
shell: "bash"
80+
script: |
81+
set -x
82+
${PREPARE_SHELL}
83+
84+
MONGODB_VERSION=${MONGODB_VERSION} \
85+
TOPOLOGY=${TOPOLOGY} \
86+
AUTH=${AUTH} \
87+
SSL=${SSL} \
88+
ORCHESTRATION_FILE=${ORCHESTRATION_FILE} \
89+
sh ${DRIVERS_TOOLS}/.evergreen/run-orchestration.sh
90+
- command: expansions.update
91+
params:
92+
file: mo-expansion.yml
93+
7694
"exec script" :
7795
- command: shell.exec
7896
type: test
@@ -233,7 +251,7 @@ functions:
233251
"upload test results":
234252
- command: attach.xunit_results
235253
params:
236-
file: ./src/rspec.xml
254+
file: ./src/tmp/*.xml
237255

238256
"run tests":
239257
- command: shell.exec
@@ -251,7 +269,9 @@ functions:
251269
DRIVER="${DRIVER}" \
252270
TEST_I18N_FALLBACKS="${TEST_I18N_FALLBACKS}" \
253271
FLE="${FLE}" \
254-
.evergreen/run-tests-docker.sh
272+
AUTH="${AUTH}" \
273+
SSL="${SSL}" \
274+
.evergreen/run-tests.sh
255275

256276
"fix absolute paths":
257277
- command: shell.exec
@@ -262,7 +282,13 @@ functions:
262282
perl -p -i -e "s|ABSOLUTE_PATH_REPLACEMENT_TOKEN|${DRIVERS_TOOLS}|g" $filename
263283
done
264284

265-
"install dependencies":
285+
"setup system":
286+
- command: subprocess.exec
287+
params:
288+
binary: bash
289+
include_expansions_in_env: ["PROJECT_DIRECTORY"]
290+
args:
291+
- "${DRIVERS_TOOLS}/.evergreen/setup.sh"
266292
- command: shell.exec
267293
type: test
268294
params:
@@ -276,13 +302,13 @@ pre:
276302
- func: "fetch source"
277303
- func: "create expansions"
278304
- func: "fix absolute paths"
279-
- func: "install dependencies"
305+
- func: "setup system"
280306

281307
post:
282308
# Removed, causing timeouts
283309
# - func: "upload working dir"
284310
- func: "upload mo artifacts"
285-
# - func: "upload test results"
311+
- func: "upload test results"
286312
- func: "upload test results to s3"
287313

288314
task_groups:
@@ -333,6 +359,7 @@ task_groups:
333359
tasks:
334360
- name: "test"
335361
commands:
362+
- func: bootstrap-mongo-orchestration
336363
- func: "run tests"
337364
- name: "test-full-atlas-task"
338365
commands:

0 commit comments

Comments
 (0)