Skip to content

Commit ad85279

Browse files
authored
CDRIVER-3620 Remove RHEL 6.2 tests and RHEL 7.0 CSE tests from Evergreen (#1180)
* CDRIVER-4552 Remove RHEL 6.2 tests from Evergreen * CDRIVER-3620 Add 4.0 replica set test to GCC 7.5 * CDRIVER-3814 Remove CSE tests from RHEL 7.0 due to OCSP cert issues
1 parent c796edd commit ad85279

File tree

4 files changed

+19
-39
lines changed

4 files changed

+19
-39
lines changed

.evergreen/config.yml

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -22933,16 +22933,16 @@ buildvariants:
2293322933
- .compression !.snappy
2293422934
- release-compile
2293522935
- debug-compile-nosasl-nossl
22936-
- .debug-compile !.sspi .openssl
22936+
- .debug-compile !.sspi .openssl !.client-side-encryption
2293722937
- .debug-compile !.sspi .nossl
2293822938
- .authentication-tests .openssl
22939-
- .latest .openssl !.nosasl .server
22939+
- .latest .openssl !.nosasl .server !.client-side-encryption
2294022940
- .latest .nossl
22941-
- .5.0 .openssl !.nosasl .server
22942-
- .4.4 .openssl !.nosasl .server
22943-
- .4.2 .openssl !.nosasl .server
22944-
- .4.0 .openssl !.nosasl .server
22945-
- .3.6 .openssl !.nosasl .server
22941+
- .5.0 .openssl !.nosasl .server !.client-side-encryption
22942+
- .4.4 .openssl !.nosasl .server !.client-side-encryption
22943+
- .4.2 .openssl !.nosasl .server !.client-side-encryption
22944+
- .4.0 .openssl !.nosasl .server !.client-side-encryption
22945+
- .3.6 .openssl !.nosasl .server !.client-side-encryption
2294622946
- name: gcc49
2294722947
display_name: GCC 4.9 (Debian 8.1)
2294822948
expansions:
@@ -23057,6 +23057,7 @@ buildvariants:
2305723057
- .4.4 .openssl !.nosasl .server
2305823058
- .4.2 .openssl !.nosasl .server
2305923059
- .4.0 .openssl !.nosasl .server
23060+
- .4.0 .openssl !.nosasl .replica_set
2306023061
- test-dns-openssl
2306123062
- test-dns-auth-openssl
2306223063
- test-dns-loadbalanced-openssl
@@ -23351,18 +23352,6 @@ buildvariants:
2335123352
- test-aws-openssl-ecs-4.4
2335223353
- test-aws-openssl-assume_role-4.4
2335323354
- test-aws-openssl-lambda-4.4
23354-
- name: rhel62
23355-
display_name: RHEL 6.2
23356-
expansions:
23357-
CC: gcc
23358-
run_on: rhel62-test
23359-
tasks:
23360-
- debug-compile-sasl-openssl
23361-
- test-4.0-server-auth-sasl-openssl
23362-
- test-4.0-replica-set-auth-sasl-openssl
23363-
- test-latest-server-auth-sasl-openssl
23364-
- test-latest-replica-set-auth-sasl-openssl
23365-
batchtime: 1440
2336623355
- name: mongohouse
2336723356
display_name: Mongohouse Test
2336823357
run_on: ubuntu1804-test

.evergreen/skip-tests.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@
7575

7676
/transactions/legacy/mongos-recovery-token/"commitTransaction retry fails on new mongos" # fails with server selection timeout (CDRIVER-4268)
7777
/crud/unified/aggregate-out-readConcern/"readConcern available with out stage" # server error on sharded: "PlanExecutor error" (CDRIVER-4161)
78-
/client_side_encryption/legacy/azureKMS/"Insert a document with auto encryption using Azure KMS provider" # failing on RHEL 7.0 / RHEL 7.1 (CDRIVER-3814)
7978
/transactions/legacy/pin-mongos/"unpin after transient error within a transaction and commit" # (CDRIVER-4351) server selection timeout (on ASAN Tests Ubuntu 18.04 build variant)
8079
/Samples # (CDRIVER-4352) strange "heartbeat failed" error
8180
/server_discovery_and_monitoring/monitoring/heartbeat/pooled/dns # (CDRIVER-4353) this initially seemed like a zSeries w/ RHEL8 issue, but it also appeared on arm64 w/ Ubuntu 18.04

build/evergreen_config_lib/variants.py

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -223,20 +223,22 @@ def days(n):
223223
Variant('gcc48rhel',
224224
'GCC 4.8 (RHEL 7.0)',
225225
'rhel70',
226+
# Skip client-side-encryption tests on RHEL 7.0 due to OCSP errors
227+
# with Azure. See CDRIVER-3620 and CDRIVER-3814.
226228
['.hardened',
227229
'.compression !.snappy',
228230
'release-compile',
229231
'debug-compile-nosasl-nossl',
230-
'.debug-compile !.sspi .openssl',
232+
'.debug-compile !.sspi .openssl !.client-side-encryption',
231233
'.debug-compile !.sspi .nossl',
232234
'.authentication-tests .openssl',
233-
'.latest .openssl !.nosasl .server',
235+
'.latest .openssl !.nosasl .server !.client-side-encryption',
234236
'.latest .nossl',
235-
'.5.0 .openssl !.nosasl .server',
236-
'.4.4 .openssl !.nosasl .server',
237-
'.4.2 .openssl !.nosasl .server',
238-
'.4.0 .openssl !.nosasl .server',
239-
'.3.6 .openssl !.nosasl .server'],
237+
'.5.0 .openssl !.nosasl .server !.client-side-encryption',
238+
'.4.4 .openssl !.nosasl .server !.client-side-encryption',
239+
'.4.2 .openssl !.nosasl .server !.client-side-encryption',
240+
'.4.0 .openssl !.nosasl .server !.client-side-encryption',
241+
'.3.6 .openssl !.nosasl .server !.client-side-encryption'],
240242
{'CC': 'gcc'}),
241243
Variant('gcc49',
242244
'GCC 4.9 (Debian 8.1)',
@@ -336,6 +338,7 @@ def days(n):
336338
'.4.4 .openssl !.nosasl .server',
337339
'.4.2 .openssl !.nosasl .server',
338340
'.4.0 .openssl !.nosasl .server',
341+
'.4.0 .openssl !.nosasl .replica_set',
339342
'test-dns-openssl',
340343
'test-dns-auth-openssl',
341344
'test-dns-loadbalanced-openssl'
@@ -604,17 +607,6 @@ def days(n):
604607
'test-aws-openssl-assume_role-4.4',
605608
'test-aws-openssl-lambda-4.4'
606609
], {'CC': 'clang'}),
607-
Variant('rhel62',
608-
'RHEL 6.2',
609-
'rhel62-test',
610-
['debug-compile-sasl-openssl',
611-
'test-4.0-server-auth-sasl-openssl',
612-
'test-4.0-replica-set-auth-sasl-openssl',
613-
'test-latest-server-auth-sasl-openssl',
614-
'test-latest-replica-set-auth-sasl-openssl'
615-
],
616-
{'CC': 'gcc'},
617-
batchtime=days(1)),
618610
Variant('mongohouse',
619611
'Mongohouse Test',
620612
'ubuntu1804-test',

src/libmongoc/doc/installing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ The MongoDB C Driver is continuously tested on a variety of platforms including:
1414
- Debian 9.2, 10.0, 11.0
1515
- macOS 10.14
1616
- Microsoft Windows Server 2008, 2016
17-
- RHEL 6.2, 7.0, 7.1, 8.1, 8.2, 8.3
17+
- RHEL 7.0, 7.1, 8.1, 8.2, 8.3
1818
- Ubuntu 16.04, 18.04, 20.04
1919
- Clang 3.4, 3.5, 3.7, 3.8, 6.0
2020
- GCC 4.8, 4.9, 5.4, 6.3, 7.5, 8.2, 8.3, 9.4, 10.2

0 commit comments

Comments
 (0)