diff options
| author | Marcos José Grillo Ramirez <marcos.grillo@mongodb.com> | 2021-03-19 14:40:09 +0100 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-03-19 14:01:47 +0000 |
| commit | 1da484f78acb20622255bc97617ee5c0dd1315f7 (patch) | |
| tree | 5657e3a3633d405fa49a9f777b0654bfe82a77dd | |
| parent | be9e48ca06057da3aaeb776cd643cb1a1fc910d4 (diff) | |
| download | mongo-1da484f78acb20622255bc97617ee5c0dd1315f7.tar.gz | |
SERVER-43899 Remove shardAsReplicaSet on ssl tests
... and blacklist sharding_with_x509.js speculative-auth-sharding.js
| -rw-r--r-- | buildscripts/resmokeconfig/suites/ssl.yml | 3 | ||||
| -rw-r--r-- | jstests/ssl/sharding_with_x509.js | 5 | ||||
| -rw-r--r-- | jstests/ssl/speculative-auth-sharding.js | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/buildscripts/resmokeconfig/suites/ssl.yml b/buildscripts/resmokeconfig/suites/ssl.yml index ca9334c9bdb..a9e91a695a8 100644 --- a/buildscripts/resmokeconfig/suites/ssl.yml +++ b/buildscripts/resmokeconfig/suites/ssl.yml @@ -4,6 +4,9 @@ selector: roots: - jstests/ssl/*.js exclude_files: + # TODO SERVER-55273: remove once x509 authentication is available for ReplSetTest + - jstests/ssl/sharding_with_x509.js + - jstests/ssl/speculative-auth-sharding.js # ssl tests start their own mongod's. executor: diff --git a/jstests/ssl/sharding_with_x509.js b/jstests/ssl/sharding_with_x509.js index 7e0a0903296..f1ab60cd3e4 100644 --- a/jstests/ssl/sharding_with_x509.js +++ b/jstests/ssl/sharding_with_x509.js @@ -15,8 +15,6 @@ var x509_options = { // Start ShardingTest with enableBalancer because ShardingTest attempts to turn off the balancer // otherwise, which it will not be authorized to do. Once SERVER-14017 is fixed the // "enableBalancer" line could be removed. -// TODO: SERVER-43899 Make sharding_with_x509.js and mixed_mode_sharded_transition.js start shards -// as replica sets. var st = new ShardingTest({ shards: 2, mongos: 1, @@ -25,8 +23,7 @@ var st = new ShardingTest({ configOptions: x509_options, mongosOptions: x509_options, rsOptions: x509_options, - shardOptions: x509_options, - shardAsReplicaSet: false + shardOptions: x509_options } }); diff --git a/jstests/ssl/speculative-auth-sharding.js b/jstests/ssl/speculative-auth-sharding.js index 4a45af1c3f7..418dd996224 100644 --- a/jstests/ssl/speculative-auth-sharding.js +++ b/jstests/ssl/speculative-auth-sharding.js @@ -26,8 +26,7 @@ const st = new ShardingTest({ configOptions: options, mongosOptions: options, rsOptions: options, - shardOptions: options, - shardAsReplicaSet: false, + shardOptions: options } }); |