Skip to content

Commit a67b088

Browse files
Prepare 8.1.6 release (#5864)
1 parent 24d2c9f commit a67b088

File tree

9 files changed

+291
-312
lines changed

9 files changed

+291
-312
lines changed

.evergreen/config.yml

Lines changed: 129 additions & 151 deletions
Large diffs are not rendered by default.

.evergreen/config/axes.yml.erb

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,6 @@ axes:
8383
- id: "ruby"
8484
display_name: Ruby Version
8585
values:
86-
- id: "ruby-2.6"
87-
display_name: ruby-2.6
88-
variables:
89-
RVM_RUBY: "ruby-2.6"
9086
- id: "ruby-2.7"
9187
display_name: ruby-2.7
9288
variables:
@@ -111,17 +107,25 @@ axes:
111107
- id: "jruby"
112108
display_name: JRuby Version
113109
values:
114-
- id: "jruby-9.3"
115-
display_name: jruby-9.3
110+
- id: "jruby-9.4"
111+
display_name: jruby-9.4
116112
variables:
117-
RVM_RUBY: "jruby-9.3"
113+
RVM_RUBY: "jruby-9.4"
118114

119115
- id: "os"
120116
display_name: OS
121117
values:
122-
- id: ubuntu-22.04
118+
- id: actual-ubuntu-22.04
123119
display_name: "Ubuntu 22.04"
124120
run_on: ubuntu2204-small
121+
- id: ubuntu-20.04
122+
display_name: "Ubuntu 20.04"
123+
run_on: ubuntu2004-small
124+
variables:
125+
DOCKER_DISTRO: ubuntu2004
126+
- id: ubuntu-22.04
127+
display_name: "Ubuntu 22.04"
128+
run_on: ubuntu2004-small
125129
variables:
126130
DOCKER_DISTRO: ubuntu2204
127131
- id: debian11
@@ -190,10 +194,6 @@ axes:
190194
display_name: "Rails master"
191195
variables:
192196
RAILS: "master"
193-
- id: "5.2"
194-
display_name: "Rails 5.2"
195-
variables:
196-
RAILS: "5.2"
197197
- id: "6.0"
198198
display_name: "Rails 6.0"
199199
variables:
@@ -215,16 +215,6 @@ axes:
215215
variables:
216216
RAILS: "7.2"
217217

218-
- id: "i18n"
219-
display_name: I18n version
220-
values:
221-
- id: '1.0'
222-
display_name: "i18n-1.0"
223-
variables:
224-
I18N: "1.0"
225-
- id: current
226-
display_name: "i18n-current"
227-
228218
- id: "test-i18n-fallbacks"
229219
display_name: Test i18n fallbacks
230220
values:

.evergreen/config/commands.yml.erb

Lines changed: 101 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -12,66 +12,61 @@ functions:
1212

1313
git submodule update --init --recursive
1414

15-
"fetch egos":
16-
- command: shell.exec
17-
params:
18-
working_dir: "src"
19-
script: |
20-
set -ex
21-
22-
curl -sfLo egos https://raw.githubusercontent.com/p-mongo/egos/master/egos
23-
chmod +x ./egos
24-
2515
"create expansions":
2616
# Make an evergreen exapanstion file with dynamic values
2717
- command: shell.exec
2818
params:
2919
working_dir: "src"
3020
script: |
31-
# Get the current unique version of this checkout
32-
if [ "${is_patch}" = "true" ]; then
33-
CURRENT_VERSION=$(git describe)-patch-${version_id}
34-
else
35-
CURRENT_VERSION=latest
36-
fi
21+
# Get the current unique version of this checkout
22+
if [ "${is_patch}" = "true" ]; then
23+
CURRENT_VERSION=$(git describe)-patch-${version_id}
24+
else
25+
CURRENT_VERSION=latest
26+
fi
3727

38-
export DRIVERS_TOOLS="$(pwd)/../drivers-tools"
28+
export DRIVERS_TOOLS="$(pwd)/.mod/drivers-evergreen-tools"
3929

40-
export MONGO_ORCHESTRATION_HOME="$DRIVERS_TOOLS/.evergreen/orchestration"
41-
export MONGODB_BINARIES="$DRIVERS_TOOLS/mongodb/bin"
42-
export UPLOAD_BUCKET="${project}"
43-
export PROJECT_DIRECTORY="$(pwd)"
30+
export MONGO_ORCHESTRATION_HOME="$DRIVERS_TOOLS/.evergreen/orchestration"
31+
export MONGODB_BINARIES="$DRIVERS_TOOLS/mongodb/bin"
32+
export UPLOAD_BUCKET="${project}"
33+
export PROJECT_DIRECTORY="$(pwd)"
4434

45-
cat <<EOT > expansion.yml
46-
CURRENT_VERSION: "$CURRENT_VERSION"
47-
DRIVERS_TOOLS: "$DRIVERS_TOOLS"
48-
MONGO_ORCHESTRATION_HOME: "$MONGO_ORCHESTRATION_HOME"
49-
MONGODB_BINARIES: "$MONGODB_BINARIES"
50-
UPLOAD_BUCKET: "$UPLOAD_BUCKET"
51-
PROJECT_DIRECTORY: "$PROJECT_DIRECTORY"
52-
PREPARE_SHELL: |
53-
set -o errexit
54-
set -o xtrace
55-
export DRIVERS_TOOLS="$DRIVERS_TOOLS"
56-
export MONGO_ORCHESTRATION_HOME="$MONGO_ORCHESTRATION_HOME"
57-
export MONGODB_BINARIES="$MONGODB_BINARIES"
58-
export UPLOAD_BUCKET="$UPLOAD_BUCKET"
59-
export PROJECT_DIRECTORY="$PROJECT_DIRECTORY"
35+
cat <<EOT > expansion.yml
36+
CURRENT_VERSION: "$CURRENT_VERSION"
37+
DRIVERS_TOOLS: "$DRIVERS_TOOLS"
38+
MONGO_ORCHESTRATION_HOME: "$MONGO_ORCHESTRATION_HOME"
39+
MONGODB_BINARIES: "$MONGODB_BINARIES"
40+
UPLOAD_BUCKET: "$UPLOAD_BUCKET"
41+
PROJECT_DIRECTORY: "$PROJECT_DIRECTORY"
42+
PREPARE_SHELL: |
43+
set -o errexit
44+
set -o xtrace
45+
export DRIVERS_TOOLS="$DRIVERS_TOOLS"
46+
export MONGO_ORCHESTRATION_HOME="$MONGO_ORCHESTRATION_HOME"
47+
export MONGODB_BINARIES="$MONGODB_BINARIES"
48+
export UPLOAD_BUCKET="$UPLOAD_BUCKET"
49+
export PROJECT_DIRECTORY="$PROJECT_DIRECTORY"
6050

61-
export TMPDIR="$MONGO_ORCHESTRATION_HOME/db"
62-
export PATH="$MONGODB_BINARIES:$PATH"
63-
export PROJECT="${project}"
51+
export TMPDIR="$MONGO_ORCHESTRATION_HOME/db"
52+
export PATH="$MONGODB_BINARIES:$PATH"
53+
export PROJECT="${project}"
6454

65-
export MONGODB_VERSION=${VERSION}
66-
export TOPOLOGY=${TOPOLOGY}
67-
export SINGLE_MONGOS=${SINGLE_MONGOS}
68-
export AUTH=${AUTH}
69-
export SSL=${SSL}
70-
export APP_TESTS=${APP_TESTS}
71-
export DOCKER_DISTRO=${DOCKER_DISTRO}
72-
EOT
73-
# See what we've done
74-
cat expansion.yml
55+
export MONGODB_VERSION="${VERSION}"
56+
export TOPOLOGY="${TOPOLOGY}"
57+
export SINGLE_MONGOS="${SINGLE_MONGOS}"
58+
export AUTH="${AUTH}"
59+
export SSL="${SSL}"
60+
export APP_TESTS="${APP_TESTS}"
61+
export DOCKER_DISTRO="${DOCKER_DISTRO}"
62+
export RVM_RUBY="${RVM_RUBY}"
63+
export RAILS="${RAILS}"
64+
export DRIVER="${DRIVER}"
65+
export TEST_I18N_FALLBACKS="${TEST_I18N_FALLBACKS}"
66+
export FLE="${FLE}"
67+
EOT
68+
# See what we've done
69+
cat expansion.yml
7570

7671
# Load the expansion file to make an evergreen variable with the current unique version
7772
- command: expansions.update
@@ -250,14 +245,12 @@ functions:
250245
${PREPARE_SHELL}
251246
env \
252247
MONGODB_URI="${MONGODB_URI}" \
253-
TOPOLOGY=${TOPOLOGY} \
248+
TOPOLOGY="${TOPOLOGY}" \
254249
RVM_RUBY="${RVM_RUBY}" \
255250
RAILS="${RAILS}" \
256251
DRIVER="${DRIVER}" \
257-
I18N="${I18N}" \
258252
TEST_I18N_FALLBACKS="${TEST_I18N_FALLBACKS}" \
259253
FLE="${FLE}" \
260-
APP_TESTS="${APP_TESTS}" \
261254
.evergreen/run-tests-docker.sh
262255

263256
"fix absolute paths":
@@ -281,7 +274,6 @@ functions:
281274

282275
pre:
283276
- func: "fetch source"
284-
- func: "fetch egos"
285277
- func: "create expansions"
286278
- func: "fix absolute paths"
287279
- func: "install dependencies"
@@ -293,7 +285,63 @@ post:
293285
#- func: "upload test results"
294286
- func: "upload test results to s3"
295287

288+
task_groups:
289+
- name: testatlas_task_group
290+
setup_group_can_fail_task: true
291+
setup_group_timeout_secs: 1800 # 30 minutes
292+
setup_group:
293+
- func: fetch source
294+
- func: create expansions
295+
- command: shell.exec
296+
params:
297+
shell: "bash"
298+
working_dir: "src"
299+
script: |
300+
${PREPARE_SHELL}
301+
302+
DRIVERS_ATLAS_PUBLIC_API_KEY="${DRIVERS_ATLAS_PUBLIC_API_KEY}" \
303+
DRIVERS_ATLAS_PRIVATE_API_KEY="${DRIVERS_ATLAS_PRIVATE_API_KEY}" \
304+
DRIVERS_ATLAS_GROUP_ID="${DRIVERS_ATLAS_GROUP_ID}" \
305+
DRIVERS_ATLAS_LAMBDA_USER="${DRIVERS_ATLAS_LAMBDA_USER}" \
306+
DRIVERS_ATLAS_LAMBDA_PASSWORD="${DRIVERS_ATLAS_LAMBDA_PASSWORD}" \
307+
LAMBDA_STACK_NAME="dbx-ruby-lambda" \
308+
MONGODB_VERSION="7.0" \
309+
task_id="${task_id}" \
310+
execution="${execution}" \
311+
$DRIVERS_TOOLS/.evergreen/atlas/setup-atlas-cluster.sh
312+
- command: expansions.update
313+
params:
314+
file: src/atlas-expansion.yml
315+
teardown_group:
316+
- command: shell.exec
317+
params:
318+
shell: "bash"
319+
working_dir: "src"
320+
script: |
321+
${PREPARE_SHELL}
322+
323+
DRIVERS_ATLAS_PUBLIC_API_KEY="${DRIVERS_ATLAS_PUBLIC_API_KEY}" \
324+
DRIVERS_ATLAS_PRIVATE_API_KEY="${DRIVERS_ATLAS_PRIVATE_API_KEY}" \
325+
DRIVERS_ATLAS_GROUP_ID="${DRIVERS_ATLAS_GROUP_ID}" \
326+
LAMBDA_STACK_NAME="dbx-ruby-lambda" \
327+
task_id="${task_id}" \
328+
execution="${execution}" \
329+
$DRIVERS_TOOLS/.evergreen/atlas/teardown-atlas-cluster.sh
330+
tasks:
331+
- test-full-atlas-task
332+
296333
tasks:
297334
- name: "test"
298335
commands:
299336
- func: "run tests"
337+
- name: "test-full-atlas-task"
338+
commands:
339+
- command: shell.exec
340+
type: test
341+
params:
342+
working_dir: "src"
343+
shell: "bash"
344+
script: |
345+
${PREPARE_SHELL}
346+
MONGODB_URI="${MONGODB_URI}" \
347+
.evergreen/run-tests-atlas-full.sh

0 commit comments

Comments
 (0)