Skip to content

Commit 72ee87f

Browse files
alcaeusalcaeus
committed
Move more tests to new format
1 parent 7cb6cd3 commit 72ee87f

16 files changed

+298
-65
lines changed

‎.evergreen/config.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,13 @@ include:
5858
- filename: .evergreen/config/test/local-4.2.yml
5959
- filename: .evergreen/config/test/local-4.0.yml
6060
- filename: .evergreen/config/test/local-3.6.yml
61+
- filename: .evergreen/config/test/load-balanced-latest.yml
62+
- filename: .evergreen/config/test/load-balanced-rapid.yml
63+
- filename: .evergreen/config/test/load-balanced-7.0.yml
64+
- filename: .evergreen/config/test/load-balanced-6.0.yml
65+
- filename: .evergreen/config/test/load-balanced-5.0.yml
66+
- filename: .evergreen/config/test/require-api-version-latest.yml
67+
- filename: .evergreen/config/test/require-api-version-rapid.yml
68+
- filename: .evergreen/config/test/require-api-version-7.0.yml
69+
- filename: .evergreen/config/test/require-api-version-6.0.yml
70+
- filename: .evergreen/config/test/require-api-version-5.0.yml

‎.evergreen/config/generate-config.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242

4343
// Test tasks
4444
$allFiles[] = generateConfigs('test', 'mongodbVersion', '_template-local.yml', 'local-%s', $localServerVersions);
45-
//$allFiles[] = generateConfigs('test', 'mongodbVersion', '_template-load-balanced.yml', 'load-balanced-%s', $loadBalancedServerVersions);
45+
$allFiles[] = generateConfigs('test', 'mongodbVersion', '_template-load-balanced.yml', 'load-balanced-%s', $loadBalancedServerVersions);
46+
$allFiles[] = generateConfigs('test', 'mongodbVersion', '_template-require-api-version.yml', 'require-api-version-%s', $requireApiServerVersions);
4647
//$allFiles[] = generateConfigs('test', 'mongodbVersion', '_template-ocsp.yml', 'ocsp-%s', $ocspServerVersions);
47-
//$allFiles[] = generateConfigs('test', 'mongodbVersion', '_template-require-api-version.yml', 'require-api-version-%s', $requireApiServerVersions);
4848
//$allFiles[] = generateConfigs('test', 'mongodbVersion', '_template-skip-crypt-shared.yml', 'skip-crypt-shared-%s', $skipCryptSharedServerVersions);
4949

5050
echo "Generated config. Use the following list to import files:\n";

‎.evergreen/config/legacy-tasks.yml

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -4,51 +4,6 @@ tasks:
44
- func: "bootstrap mongohoused"
55
- func: "run atlas data lake test"
66

7-
- name: "test-requireApiVersion"
8-
tags: ["versioned-api"]
9-
commands:
10-
- func: "bootstrap mongo-orchestration"
11-
vars:
12-
TOPOLOGY: "server"
13-
AUTH: "auth"
14-
REQUIRE_API_VERSION: "yes"
15-
- func: "start kms servers"
16-
- func: "set aws temp creds"
17-
- func: "run tests"
18-
vars:
19-
API_VERSION: "1"
20-
21-
- name: "test-acceptApiVersion2"
22-
tags: ["versioned-api"]
23-
commands:
24-
- func: "bootstrap mongo-orchestration"
25-
vars:
26-
TOPOLOGY: "server"
27-
ORCHESTRATION_FILE: "versioned-api-testing.json"
28-
- func: "start kms servers"
29-
- func: "set aws temp creds"
30-
- func: "run tests"
31-
vars:
32-
TESTS: "versioned-api"
33-
34-
- name: "test-loadBalanced"
35-
tags: ["loadbalanced"]
36-
commands:
37-
- func: "bootstrap mongo-orchestration"
38-
vars:
39-
TOPOLOGY: "sharded_cluster"
40-
LOAD_BALANCER: "true"
41-
SSL: "yes"
42-
- func: "start load balancer"
43-
- func: "start kms servers"
44-
- func: "set aws temp creds"
45-
- func: "run tests"
46-
vars:
47-
# Note: loadBalanced=true should already be appended to SINGLE_MONGOS_LB_URI
48-
MONGODB_URI: "${SINGLE_MONGOS_LB_URI}"
49-
SSL: "yes"
50-
# Note: "stop load balancer" will be called from "post"
51-
527
- name: "test-csfle-crypt_shared"
538
commands:
549
- func: "bootstrap mongo-orchestration"

‎.evergreen/config/legacy-variants.yml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -104,24 +104,6 @@ buildvariants:
104104
tasks:
105105
- name: "test-atlas-data-lake"
106106

107-
- matrix_name: "test-requireApiVersion"
108-
matrix_spec: { "os": "debian11", "mongodb-versions": "*", "php-edge-versions": "latest-stable", "driver-versions": "latest-stable" }
109-
display_name: "Versioned API - ${mongodb-versions}"
110-
exclude_spec:
111-
# Stable API is available from MongoDB 5.0+
112-
- { "os": "debian11", "mongodb-versions": ["3.6", "4.0", "4.2", "4.4"], "php-edge-versions": "latest-stable", "driver-versions": "latest-stable" }
113-
tasks:
114-
- .versioned-api
115-
116-
- matrix_name: "test-loadBalanced"
117-
matrix_spec: { "os": "debian11", "mongodb-versions": "*", "php-edge-versions": "latest-stable", "driver-versions": "latest-stable" }
118-
display_name: "Load balanced - ${mongodb-versions}"
119-
exclude_spec:
120-
# Load balancer is available from MongoDB 5.0+
121-
- { "os": "debian11", "mongodb-versions": ["3.6", "4.0", "4.2", "4.4"], "php-edge-versions": "latest-stable", "driver-versions": "latest-stable" }
122-
tasks:
123-
- name: "test-loadBalanced"
124-
125107
# CSFLE tests (crypt_shared and mongocryptd) are tested on RHEL 8 as it's the only version that supports
126108
# 4.2 AND 6.0 (which is required for crypt_shared), as well as a somewhat relevant PHP version.
127109
# Newer MongoDB version may require adding different operating systems here

‎.evergreen/config/test/_template-load-balanced.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
tasks:
2+
- name: "test-mongodb-%mongodbVersion%-loadbalanced"
3+
tags: ["sharded", "local", "%mongodbVersion%", "loadbalanced"]
4+
commands:
5+
- func: "bootstrap mongo-orchestration"
6+
vars:
7+
TOPOLOGY: "sharded_cluster"
8+
MONGODB_VERSION: "%mongodbVersion%"
9+
LOAD_BALANCER: "true"
10+
SSL: "yes"
11+
- func: "start load balancer"
12+
- func: "start kms servers"
13+
- func: "set aws temp creds"
14+
- func: "run tests"
15+
vars:
16+
MONGODB_URI: "${SINGLE_MONGOS_LB_URI}"
17+
SSL: "yes"

‎.evergreen/config/test/_template-require-api-version.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
tasks:
2+
- name: "test-requireApiVersion-%mongodbVersion%"
3+
tags: ["standalone", "local", "%mongodbVersion%", "versioned_api"]
4+
commands:
5+
- func: "bootstrap mongo-orchestration"
6+
vars:
7+
TOPOLOGY: "server"
8+
AUTH: "auth"
9+
REQUIRE_API_VERSION: "yes"
10+
MONGODB_VERSION: "%mongodbVersion%"
11+
- func: "start kms servers"
12+
- func: "set aws temp creds"
13+
- func: "run tests"
14+
vars:
15+
API_VERSION: "1"
16+
17+
- name: "test-acceptApiVersion2-%mongodbVersion%"
18+
tags: ["standalone", "local", "%mongodbVersion%", "versioned_api"]
19+
commands:
20+
- func: "bootstrap mongo-orchestration"
21+
vars:
22+
TOPOLOGY: "server"
23+
ORCHESTRATION_FILE: "versioned-api-testing.json"
24+
MONGODB_VERSION: "%mongodbVersion%"
25+
- func: "start kms servers"
26+
- func: "set aws temp creds"
27+
- func: "run tests"
28+
vars:
29+
TESTS: "versioned-api"

‎.evergreen/config/test/load-balanced-5.0.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# This file is generated automatically - please edit the corresponding template file!
2+
tasks:
3+
- name: "test-mongodb-5.0-loadbalanced"
4+
tags: ["sharded", "local", "5.0", "loadbalanced"]
5+
commands:
6+
- func: "bootstrap mongo-orchestration"
7+
vars:
8+
TOPOLOGY: "sharded_cluster"
9+
MONGODB_VERSION: "5.0"
10+
LOAD_BALANCER: "true"
11+
SSL: "yes"
12+
- func: "start load balancer"
13+
- func: "start kms servers"
14+
- func: "set aws temp creds"
15+
- func: "run tests"
16+
vars:
17+
MONGODB_URI: "${SINGLE_MONGOS_LB_URI}"
18+
SSL: "yes"

‎.evergreen/config/test/load-balanced-6.0.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# This file is generated automatically - please edit the corresponding template file!
2+
tasks:
3+
- name: "test-mongodb-6.0-loadbalanced"
4+
tags: ["sharded", "local", "6.0", "loadbalanced"]
5+
commands:
6+
- func: "bootstrap mongo-orchestration"
7+
vars:
8+
TOPOLOGY: "sharded_cluster"
9+
MONGODB_VERSION: "6.0"
10+
LOAD_BALANCER: "true"
11+
SSL: "yes"
12+
- func: "start load balancer"
13+
- func: "start kms servers"
14+
- func: "set aws temp creds"
15+
- func: "run tests"
16+
vars:
17+
MONGODB_URI: "${SINGLE_MONGOS_LB_URI}"
18+
SSL: "yes"

‎.evergreen/config/test/load-balanced-7.0.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# This file is generated automatically - please edit the corresponding template file!
2+
tasks:
3+
- name: "test-mongodb-7.0-loadbalanced"
4+
tags: ["sharded", "local", "7.0", "loadbalanced"]
5+
commands:
6+
- func: "bootstrap mongo-orchestration"
7+
vars:
8+
TOPOLOGY: "sharded_cluster"
9+
MONGODB_VERSION: "7.0"
10+
LOAD_BALANCER: "true"
11+
SSL: "yes"
12+
- func: "start load balancer"
13+
- func: "start kms servers"
14+
- func: "set aws temp creds"
15+
- func: "run tests"
16+
vars:
17+
MONGODB_URI: "${SINGLE_MONGOS_LB_URI}"
18+
SSL: "yes"

‎.evergreen/config/test/load-balanced-latest.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# This file is generated automatically - please edit the corresponding template file!
2+
tasks:
3+
- name: "test-mongodb-latest-loadbalanced"
4+
tags: ["sharded", "local", "latest", "loadbalanced"]
5+
commands:
6+
- func: "bootstrap mongo-orchestration"
7+
vars:
8+
TOPOLOGY: "sharded_cluster"
9+
MONGODB_VERSION: "latest"
10+
LOAD_BALANCER: "true"
11+
SSL: "yes"
12+
- func: "start load balancer"
13+
- func: "start kms servers"
14+
- func: "set aws temp creds"
15+
- func: "run tests"
16+
vars:
17+
MONGODB_URI: "${SINGLE_MONGOS_LB_URI}"
18+
SSL: "yes"

‎.evergreen/config/test/load-balanced-rapid.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# This file is generated automatically - please edit the corresponding template file!
2+
tasks:
3+
- name: "test-mongodb-rapid-loadbalanced"
4+
tags: ["sharded", "local", "rapid", "loadbalanced"]
5+
commands:
6+
- func: "bootstrap mongo-orchestration"
7+
vars:
8+
TOPOLOGY: "sharded_cluster"
9+
MONGODB_VERSION: "rapid"
10+
LOAD_BALANCER: "true"
11+
SSL: "yes"
12+
- func: "start load balancer"
13+
- func: "start kms servers"
14+
- func: "set aws temp creds"
15+
- func: "run tests"
16+
vars:
17+
MONGODB_URI: "${SINGLE_MONGOS_LB_URI}"
18+
SSL: "yes"

‎.evergreen/config/test/require-api-version-5.0.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# This file is generated automatically - please edit the corresponding template file!
2+
tasks:
3+
- name: "test-requireApiVersion-5.0"
4+
tags: ["standalone", "local", "5.0", "versioned_api"]
5+
commands:
6+
- func: "bootstrap mongo-orchestration"
7+
vars:
8+
TOPOLOGY: "server"
9+
AUTH: "auth"
10+
REQUIRE_API_VERSION: "yes"
11+
MONGODB_VERSION: "5.0"
12+
- func: "start kms servers"
13+
- func: "set aws temp creds"
14+
- func: "run tests"
15+
vars:
16+
API_VERSION: "1"
17+
18+
- name: "test-acceptApiVersion2-5.0"
19+
tags: ["standalone", "local", "5.0", "versioned_api"]
20+
commands:
21+
- func: "bootstrap mongo-orchestration"
22+
vars:
23+
TOPOLOGY: "server"
24+
ORCHESTRATION_FILE: "versioned-api-testing.json"
25+
MONGODB_VERSION: "5.0"
26+
- func: "start kms servers"
27+
- func: "set aws temp creds"
28+
- func: "run tests"
29+
vars:
30+
TESTS: "versioned-api"

‎.evergreen/config/test/require-api-version-6.0.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# This file is generated automatically - please edit the corresponding template file!
2+
tasks:
3+
- name: "test-requireApiVersion-6.0"
4+
tags: ["standalone", "local", "6.0", "versioned_api"]
5+
commands:
6+
- func: "bootstrap mongo-orchestration"
7+
vars:
8+
TOPOLOGY: "server"
9+
AUTH: "auth"
10+
REQUIRE_API_VERSION: "yes"
11+
MONGODB_VERSION: "6.0"
12+
- func: "start kms servers"
13+
- func: "set aws temp creds"
14+
- func: "run tests"
15+
vars:
16+
API_VERSION: "1"
17+
18+
- name: "test-acceptApiVersion2-6.0"
19+
tags: ["standalone", "local", "6.0", "versioned_api"]
20+
commands:
21+
- func: "bootstrap mongo-orchestration"
22+
vars:
23+
TOPOLOGY: "server"
24+
ORCHESTRATION_FILE: "versioned-api-testing.json"
25+
MONGODB_VERSION: "6.0"
26+
- func: "start kms servers"
27+
- func: "set aws temp creds"
28+
- func: "run tests"
29+
vars:
30+
TESTS: "versioned-api"

‎.evergreen/config/test/require-api-version-7.0.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# This file is generated automatically - please edit the corresponding template file!
2+
tasks:
3+
- name: "test-requireApiVersion-7.0"
4+
tags: ["standalone", "local", "7.0", "versioned_api"]
5+
commands:
6+
- func: "bootstrap mongo-orchestration"
7+
vars:
8+
TOPOLOGY: "server"
9+
AUTH: "auth"
10+
REQUIRE_API_VERSION: "yes"
11+
MONGODB_VERSION: "7.0"
12+
- func: "start kms servers"
13+
- func: "set aws temp creds"
14+
- func: "run tests"
15+
vars:
16+
API_VERSION: "1"
17+
18+
- name: "test-acceptApiVersion2-7.0"
19+
tags: ["standalone", "local", "7.0", "versioned_api"]
20+
commands:
21+
- func: "bootstrap mongo-orchestration"
22+
vars:
23+
TOPOLOGY: "server"
24+
ORCHESTRATION_FILE: "versioned-api-testing.json"
25+
MONGODB_VERSION: "7.0"
26+
- func: "start kms servers"
27+
- func: "set aws temp creds"
28+
- func: "run tests"
29+
vars:
30+
TESTS: "versioned-api"

‎.evergreen/config/test/require-api-version-latest.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# This file is generated automatically - please edit the corresponding template file!
2+
tasks:
3+
- name: "test-requireApiVersion-latest"
4+
tags: ["standalone", "local", "latest", "versioned_api"]
5+
commands:
6+
- func: "bootstrap mongo-orchestration"
7+
vars:
8+
TOPOLOGY: "server"
9+
AUTH: "auth"
10+
REQUIRE_API_VERSION: "yes"
11+
MONGODB_VERSION: "latest"
12+
- func: "start kms servers"
13+
- func: "set aws temp creds"
14+
- func: "run tests"
15+
vars:
16+
API_VERSION: "1"
17+
18+
- name: "test-acceptApiVersion2-latest"
19+
tags: ["standalone", "local", "latest", "versioned_api"]
20+
commands:
21+
- func: "bootstrap mongo-orchestration"
22+
vars:
23+
TOPOLOGY: "server"
24+
ORCHESTRATION_FILE: "versioned-api-testing.json"
25+
MONGODB_VERSION: "latest"
26+
- func: "start kms servers"
27+
- func: "set aws temp creds"
28+
- func: "run tests"
29+
vars:
30+
TESTS: "versioned-api"

0 commit comments

Comments
 (0)