Skip to content

Commit 3560e93

Browse files
committed
Move Atlas Tests to new format
1 parent b215195 commit 3560e93

File tree

6 files changed

+61
-44
lines changed

6 files changed

+61
-44
lines changed

.evergreen/config.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ include:
4040
- filename: .evergreen/config/build-task-groups.yml
4141
- filename: .evergreen/config/build-variants.yml
4242

43-
# - filename: .evergreen/config/test-tasks.yml
43+
- filename: .evergreen/config/test-tasks.yml
44+
- filename: .evergreen/config/test-task-groups.yml
4445
- filename: .evergreen/config/test-variants.yml
4546

4647
# Automatically generated files

.evergreen/config/legacy-tasks.yml

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,4 @@
11
tasks:
2-
- name: "test-standalone"
3-
tags: ["standalone"]
4-
commands:
5-
- func: "bootstrap mongo-orchestration"
6-
vars:
7-
TOPOLOGY: "server"
8-
- func: "start kms servers"
9-
- func: "set aws temp creds"
10-
- func: "run tests"
11-
12-
- name: "test-replica_set"
13-
tags: ["replica_set"]
14-
commands:
15-
- func: "bootstrap mongo-orchestration"
16-
vars:
17-
TOPOLOGY: "replica_set"
18-
- func: "start kms servers"
19-
- func: "set aws temp creds"
20-
- func: "run tests"
21-
22-
- name: "test-sharded_cluster"
23-
tags: ["sharded_cluster"]
24-
commands:
25-
- func: "bootstrap mongo-orchestration"
26-
vars:
27-
TOPOLOGY: "sharded_cluster"
28-
- func: "start kms servers"
29-
- func: "set aws temp creds"
30-
- func: "run tests"
31-
322
- name: "test-atlas-data-lake"
333
commands:
344
- func: "bootstrap mongohoused"
@@ -121,10 +91,3 @@ tasks:
12191
client_side_encryption_aws_access_key_id: ""
12292
client_side_encryption_aws_secret_access_key: ""
12393
TESTS: "csfle-without-aws-creds"
124-
125-
- name: "test-atlas"
126-
commands:
127-
- func: "start kms servers"
128-
- func: "run tests"
129-
vars:
130-
TESTS: "atlas"

.evergreen/config/legacy-variants.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,3 @@ buildvariants:
158158
- { "os": "debian11", "mongodb-versions": ["3.6", "4.0", "4.2", "4.4", "5.0"], "php-edge-versions": "latest-stable", "driver-versions": "latest-stable" }
159159
tasks:
160160
- name: "test-without_aws_creds"
161-
162-
- matrix_name: rhel8-test-atlas
163-
matrix_spec: { "os": ["rhel80"], "php-edge-versions": "latest-stable", "driver-versions": "latest-stable" }
164-
display_name: Atlas Tests
165-
tasks:
166-
- test_atlas_task_group
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
task_groups:
2+
- name: test_atlas_task_group
3+
setup_group:
4+
- func: "fetch source"
5+
- func: "prepare resources"
6+
- func: "fix absolute paths"
7+
- func: "make files executable"
8+
- func: "install dependencies"
9+
- func: "locate PHP binaries"
10+
- func: "fetch extension"
11+
- func: "install composer"
12+
- command: subprocess.exec
13+
params:
14+
working_dir: src
15+
binary: bash
16+
add_expansions_to_env: true
17+
env:
18+
MONGODB_VERSION: '7.0'
19+
args:
20+
- ${DRIVERS_TOOLS}/.evergreen/atlas/setup-atlas-cluster.sh
21+
- command: expansions.update
22+
params:
23+
file: src/atlas-expansion.yml
24+
teardown_group:
25+
- command: subprocess.exec
26+
params:
27+
working_dir: src
28+
binary: bash
29+
add_expansions_to_env: true
30+
args:
31+
- ${DRIVERS_TOOLS}/.evergreen/atlas/teardown-atlas-cluster.sh
32+
- func: "upload test results"
33+
- func: "cleanup"
34+
setup_group_can_fail_task: true
35+
setup_group_timeout_secs: 1800
36+
tasks:
37+
- test-atlas

.evergreen/config/test-tasks.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
tasks:
2+
- name: "test-atlas"
3+
commands:
4+
- func: "start kms servers"
5+
- func: "run tests"
6+
vars:
7+
TESTS: "atlas"

.evergreen/config/test-variants.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,3 +75,18 @@ buildvariants:
7575
name: "build-php-7.4"
7676
tasks:
7777
- ".replicaset .local .7.0"
78+
79+
# Test Atlas Tests on RHEL 8
80+
- name: test-rhel80-php82-atlas
81+
tags: ["test", "debian", "x64"]
82+
display_name: "Test: RHEL 8.0, PHP 8.2"
83+
run_on: rhel80-small
84+
expansions:
85+
FETCH_BUILD_VARIANT: "build-rhel80"
86+
FETCH_BUILD_TASK: "build-php-8.2"
87+
PHP_VERSION: "8.2"
88+
depends_on:
89+
- variant: "build-rhel80"
90+
name: "build-php-8.2"
91+
tasks:
92+
- test_atlas_task_group

0 commit comments

Comments
 (0)