summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--buildscripts/resmokeconfig/suites/causally_consistent_hedged_reads_jscore_passthrough.yml1
-rw-r--r--buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough.yml1
-rw-r--r--buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough_auth.yml1
-rw-r--r--buildscripts/resmokeconfig/suites/logical_session_cache_sharding_100ms_refresh_jscore_passthrough.yml2
-rw-r--r--buildscripts/resmokeconfig/suites/logical_session_cache_sharding_10sec_refresh_jscore_passthrough.yml2
-rw-r--r--buildscripts/resmokeconfig/suites/logical_session_cache_sharding_1sec_refresh_jscore_passthrough.yml2
-rw-r--r--buildscripts/resmokeconfig/suites/logical_session_cache_sharding_default_refresh_jscore_passthrough.yml2
-rw-r--r--buildscripts/resmokeconfig/suites/multi_shard_local_read_write_multi_stmt_txn_jscore_passthrough.yml2
-rw-r--r--buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_jscore_passthrough.yml2
-rw-r--r--buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_kill_primary_jscore_passthrough.yml2
-rw-r--r--buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_stepdown_primary_jscore_passthrough.yml2
-rw-r--r--buildscripts/resmokeconfig/suites/multi_stmt_txn_jscore_passthrough_with_migration.yml2
-rw-r--r--buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_passthrough.yml2
-rw-r--r--buildscripts/resmokeconfig/suites/sharded_causally_consistent_read_concern_snapshot_passthrough.yml3
-rw-r--r--buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml2
-rw-r--r--buildscripts/resmokeconfig/suites/sharded_multi_stmt_txn_jscore_passthrough.yml1
-rw-r--r--buildscripts/resmokeconfig/suites/sharding_jscore_op_query_passthrough.yml1
-rw-r--r--buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml1
-rw-r--r--buildscripts/resmokeconfig/suites/sharding_update_v1_oplog_jscore_passthrough.yml1
-rw-r--r--jstests/core/diagdata.js15
-rw-r--r--jstests/core/views/dbref_projection.js1
-rw-r--r--jstests/core/views/duplicate_ns.js1
-rw-r--r--jstests/core/views/invalid_system_views.js1
-rw-r--r--jstests/core/views/view_with_invalid_dbname.js1
-rw-r--r--jstests/core/views/views_aggregation.js1
-rw-r--r--jstests/core/views/views_all_commands.js1
-rw-r--r--jstests/core/views/views_basic.js8
-rw-r--r--jstests/core/views/views_change.js1
-rw-r--r--jstests/core/views/views_coll_stats.js9
-rw-r--r--jstests/core/views/views_collation.js1
-rw-r--r--jstests/core/views/views_count.js1
-rw-r--r--jstests/core/views/views_creation.js1
-rw-r--r--jstests/core/views/views_distinct.js9
-rw-r--r--jstests/core/views/views_drop.js1
-rw-r--r--jstests/core/views/views_find.js1
-rw-r--r--jstests/core/views/views_stats.js2
-rw-r--r--jstests/core/views/views_validation.js1
37 files changed, 47 insertions, 41 deletions
diff --git a/buildscripts/resmokeconfig/suites/causally_consistent_hedged_reads_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/causally_consistent_hedged_reads_jscore_passthrough.yml
index 7eed921e76e..74816ef233a 100644
--- a/buildscripts/resmokeconfig/suites/causally_consistent_hedged_reads_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/causally_consistent_hedged_reads_jscore_passthrough.yml
@@ -20,7 +20,6 @@ selector:
- jstests/core/currentop.js # uses fsync.
- jstests/core/dbhash.js # dbhash.
- jstests/core/dbhash2.js # dbhash.
- - jstests/core/diagdata.js # Command not supported in mongos
- jstests/core/dropdb_race.js # syncdelay.
- jstests/core/fsync.js # uses fsync.
- jstests/core/geo_update_btree2.js # notablescan.
diff --git a/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough.yml
index a65289cba68..00f978803b9 100644
--- a/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough.yml
@@ -20,7 +20,6 @@ selector:
- jstests/core/currentop.js # uses fsync.
- jstests/core/dbhash.js # dbhash.
- jstests/core/dbhash2.js # dbhash.
- - jstests/core/diagdata.js # Command not supported in mongos
- jstests/core/dropdb_race.js # syncdelay.
- jstests/core/fsync.js # uses fsync.
- jstests/core/geo_update_btree2.js # notablescan.
diff --git a/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough_auth.yml b/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough_auth.yml
index 62272aec219..03a53487f7c 100644
--- a/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough_auth.yml
+++ b/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough_auth.yml
@@ -30,7 +30,6 @@ selector:
- jstests/core/currentop.js # uses fsync.
- jstests/core/dbhash.js # dbhash.
- jstests/core/dbhash2.js # dbhash.
- - jstests/core/diagdata.js # Command not supported in mongos
- jstests/core/dropdb_race.js # syncdelay.
- jstests/core/fsync.js # uses fsync.
- jstests/core/geo_update_btree2.js # notablescan.
diff --git a/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_100ms_refresh_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_100ms_refresh_jscore_passthrough.yml
index f35148656d6..9358b0af640 100644
--- a/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_100ms_refresh_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_100ms_refresh_jscore_passthrough.yml
@@ -18,7 +18,6 @@ selector:
- jstests/core/currentop.js # uses fsync.
- jstests/core/dbhash.js # dbhash.
- jstests/core/dbhash2.js # dbhash.
- - jstests/core/diagdata.js # Command not supported in mongos
- jstests/core/dropdb_race.js # syncdelay.
- jstests/core/fsync.js # uses fsync.
- jstests/core/geo_s2cursorlimitskip.js # profiling.
@@ -52,7 +51,6 @@ selector:
- jstests/core/dbcase.js
- jstests/core/dbcase2.js
- jstests/core/no_db_created.js
- - jstests/core/views/*.js # Views tests aren't expected to work when collections are implicitly sharded.
- jstests/core/killop_drop_collection.js # Uses fsyncLock.
# These tests fail because sharded clusters do not clean up correctly after failed index builds.
# See SERVER-33207 as an example.
diff --git a/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_10sec_refresh_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_10sec_refresh_jscore_passthrough.yml
index faa29239a02..680e7ca3e48 100644
--- a/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_10sec_refresh_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_10sec_refresh_jscore_passthrough.yml
@@ -18,7 +18,6 @@ selector:
- jstests/core/currentop.js # uses fsync.
- jstests/core/dbhash.js # dbhash.
- jstests/core/dbhash2.js # dbhash.
- - jstests/core/diagdata.js # Command not supported in mongos
- jstests/core/dropdb_race.js # syncdelay.
- jstests/core/fsync.js # uses fsync.
- jstests/core/geo_s2cursorlimitskip.js # profiling.
@@ -52,7 +51,6 @@ selector:
- jstests/core/dbcase.js
- jstests/core/dbcase2.js
- jstests/core/no_db_created.js
- - jstests/core/views/*.js # Views tests aren't expected to work when collections are implicitly sharded.
- jstests/core/killop_drop_collection.js # Uses fsyncLock.
# These tests fail because sharded clusters do not clean up correctly after failed index builds.
# See SERVER-33207 as an example.
diff --git a/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_1sec_refresh_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_1sec_refresh_jscore_passthrough.yml
index 9a92c57e728..8e739bbecb3 100644
--- a/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_1sec_refresh_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_1sec_refresh_jscore_passthrough.yml
@@ -18,7 +18,6 @@ selector:
- jstests/core/currentop.js # uses fsync.
- jstests/core/dbhash.js # dbhash.
- jstests/core/dbhash2.js # dbhash.
- - jstests/core/diagdata.js # Command not supported in mongos
- jstests/core/dropdb_race.js # syncdelay.
- jstests/core/fsync.js # uses fsync.
- jstests/core/geo_s2cursorlimitskip.js # profiling.
@@ -52,7 +51,6 @@ selector:
- jstests/core/dbcase.js
- jstests/core/dbcase2.js
- jstests/core/no_db_created.js
- - jstests/core/views/*.js # Views tests aren't expected to work when collections are implicitly sharded.
- jstests/core/killop_drop_collection.js # Uses fsyncLock.
# These tests fail because sharded clusters do not clean up correctly after failed index builds.
# See SERVER-33207 as an example.
diff --git a/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_default_refresh_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_default_refresh_jscore_passthrough.yml
index bbfdeda6d12..a72b84c3680 100644
--- a/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_default_refresh_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_default_refresh_jscore_passthrough.yml
@@ -18,7 +18,6 @@ selector:
- jstests/core/currentop.js # uses fsync.
- jstests/core/dbhash.js # dbhash.
- jstests/core/dbhash2.js # dbhash.
- - jstests/core/diagdata.js # Command not supported in mongos
- jstests/core/dropdb_race.js # syncdelay.
- jstests/core/fsync.js # uses fsync.
- jstests/core/geo_s2cursorlimitskip.js # profiling.
@@ -52,7 +51,6 @@ selector:
- jstests/core/dbcase.js
- jstests/core/dbcase2.js
- jstests/core/no_db_created.js
- - jstests/core/views/*.js # Views tests aren't expected to work when collections are implicitly sharded.
- jstests/core/killop_drop_collection.js # Uses fsyncLock.
# These tests fail because sharded clusters do not clean up correctly after failed index builds.
# See SERVER-33207 as an example.
diff --git a/buildscripts/resmokeconfig/suites/multi_shard_local_read_write_multi_stmt_txn_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/multi_shard_local_read_write_multi_stmt_txn_jscore_passthrough.yml
index 902521afbbd..46d6cf57a1a 100644
--- a/buildscripts/resmokeconfig/suites/multi_shard_local_read_write_multi_stmt_txn_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/multi_shard_local_read_write_multi_stmt_txn_jscore_passthrough.yml
@@ -19,7 +19,6 @@ selector:
- jstests/core/currentop.js # uses fsync.
- jstests/core/dbhash.js # dbhash.
- jstests/core/dbhash2.js # dbhash.
- - jstests/core/diagdata.js # Command not supported in mongos
- jstests/core/dropdb_race.js # syncdelay.
- jstests/core/fsync.js # uses fsync.
- jstests/core/geo_s2cursorlimitskip.js # profiling.
@@ -52,7 +51,6 @@ selector:
- jstests/core/dbcase.js
- jstests/core/dbcase2.js
- jstests/core/no_db_created.js
- - jstests/core/views/*.js # Views tests aren't expected to work when collections are implicitly sharded.
- jstests/core/killop_drop_collection.js # Uses fsyncLock.
# These tests fail because sharded clusters do not clean up correctly after failed index builds.
# See SERVER-33207 as an example.
diff --git a/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_jscore_passthrough.yml
index 9c30a68f072..f39c336cf67 100644
--- a/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_jscore_passthrough.yml
@@ -19,7 +19,6 @@ selector:
- jstests/core/currentop.js # uses fsync.
- jstests/core/dbhash.js # dbhash.
- jstests/core/dbhash2.js # dbhash.
- - jstests/core/diagdata.js # Command not supported in mongos
- jstests/core/dropdb_race.js # syncdelay.
- jstests/core/fsync.js # uses fsync.
- jstests/core/geo_s2cursorlimitskip.js # profiling.
@@ -52,7 +51,6 @@ selector:
- jstests/core/dbcase.js
- jstests/core/dbcase2.js
- jstests/core/no_db_created.js
- - jstests/core/views/*.js # Views tests aren't expected to work when collections are implicitly sharded.
- jstests/core/killop_drop_collection.js # Uses fsyncLock.
# These tests fail because sharded clusters do not clean up correctly after failed index builds.
# See SERVER-33207 as an example.
diff --git a/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_kill_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_kill_primary_jscore_passthrough.yml
index 529b81aaba2..44164439309 100644
--- a/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_kill_primary_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_kill_primary_jscore_passthrough.yml
@@ -19,7 +19,6 @@ selector:
- jstests/core/currentop.js # uses fsync.
- jstests/core/dbhash.js # dbhash.
- jstests/core/dbhash2.js # dbhash.
- - jstests/core/diagdata.js # Command not supported in mongos
- jstests/core/dropdb_race.js # syncdelay.
- jstests/core/fsync.js # uses fsync.
- jstests/core/geo_s2cursorlimitskip.js # profiling.
@@ -52,7 +51,6 @@ selector:
- jstests/core/dbcase.js
- jstests/core/dbcase2.js
- jstests/core/no_db_created.js
- - jstests/core/views/*.js # Views tests aren't expected to work when collections are implicitly sharded.
- jstests/core/killop_drop_collection.js # Uses fsyncLock.
# These tests fail because sharded clusters do not clean up correctly after failed index builds.
# See SERVER-33207 as an example.
diff --git a/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_stepdown_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_stepdown_primary_jscore_passthrough.yml
index e55baf74095..48ac005b41b 100644
--- a/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_stepdown_primary_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_stepdown_primary_jscore_passthrough.yml
@@ -19,7 +19,6 @@ selector:
- jstests/core/currentop.js # uses fsync.
- jstests/core/dbhash.js # dbhash.
- jstests/core/dbhash2.js # dbhash.
- - jstests/core/diagdata.js # Command not supported in mongos
- jstests/core/dropdb_race.js # syncdelay.
- jstests/core/fsync.js # uses fsync.
- jstests/core/geo_s2cursorlimitskip.js # profiling.
@@ -52,7 +51,6 @@ selector:
- jstests/core/dbcase.js
- jstests/core/dbcase2.js
- jstests/core/no_db_created.js
- - jstests/core/views/*.js # Views tests aren't expected to work when collections are implicitly sharded.
- jstests/core/killop_drop_collection.js # Uses fsyncLock.
# These tests fail because sharded clusters do not clean up correctly after failed index builds.
# See SERVER-33207 as an example.
diff --git a/buildscripts/resmokeconfig/suites/multi_stmt_txn_jscore_passthrough_with_migration.yml b/buildscripts/resmokeconfig/suites/multi_stmt_txn_jscore_passthrough_with_migration.yml
index 6fa2ff95160..ab18e0cec17 100644
--- a/buildscripts/resmokeconfig/suites/multi_stmt_txn_jscore_passthrough_with_migration.yml
+++ b/buildscripts/resmokeconfig/suites/multi_stmt_txn_jscore_passthrough_with_migration.yml
@@ -19,7 +19,6 @@ selector:
- jstests/core/currentop.js # uses fsync.
- jstests/core/dbhash.js # dbhash.
- jstests/core/dbhash2.js # dbhash.
- - jstests/core/diagdata.js # Command not supported in mongos
- jstests/core/dropdb_race.js # syncdelay.
- jstests/core/fsync.js # uses fsync.
- jstests/core/geo_s2cursorlimitskip.js # profiling.
@@ -52,7 +51,6 @@ selector:
- jstests/core/dbcase.js
- jstests/core/dbcase2.js
- jstests/core/no_db_created.js
- - jstests/core/views/*.js # Views tests aren't expected to work when collections are implicitly sharded.
- jstests/core/killop_drop_collection.js # Uses fsyncLock.
# These tests fail because sharded clusters do not clean up correctly after failed index builds.
# See SERVER-33207 as an example.
diff --git a/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_passthrough.yml
index ff93a83d7d2..226450f6ff7 100644
--- a/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_passthrough.yml
@@ -19,7 +19,6 @@ selector:
- jstests/core/currentop.js # uses fsync.
- jstests/core/dbhash.js # dbhash.
- jstests/core/dbhash2.js # dbhash.
- - jstests/core/diagdata.js # Command not supported in mongos
- jstests/core/dropdb_race.js # syncdelay.
- jstests/core/fsync.js # uses fsync.
- jstests/core/geo_update_btree2.js # notablescan.
@@ -48,7 +47,6 @@ selector:
- jstests/core/dbcase.js
- jstests/core/dbcase2.js
- jstests/core/no_db_created.js
- - jstests/core/views/*.js # Views tests aren't expected to work when collections are implicitly sharded.
- jstests/core/killop_drop_collection.js # Uses fsyncLock.
# Tests that need triaging & remediation | blacklist decision
# Comments list possible problem point under review.
diff --git a/buildscripts/resmokeconfig/suites/sharded_causally_consistent_read_concern_snapshot_passthrough.yml b/buildscripts/resmokeconfig/suites/sharded_causally_consistent_read_concern_snapshot_passthrough.yml
index 0030f174a6c..5994b1a5fe9 100644
--- a/buildscripts/resmokeconfig/suites/sharded_causally_consistent_read_concern_snapshot_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/sharded_causally_consistent_read_concern_snapshot_passthrough.yml
@@ -19,7 +19,6 @@ selector:
- jstests/core/currentop.js # uses fsync.
- jstests/core/dbhash.js # dbhash.
- jstests/core/dbhash2.js # dbhash.
- - jstests/core/diagdata.js # Command not supported in mongos
- jstests/core/dropdb_race.js # syncdelay.
- jstests/core/fsync.js # uses fsync.
- jstests/core/geo_update_btree2.js # notablescan.
@@ -49,8 +48,6 @@ selector:
- jstests/core/dbcase.js
- jstests/core/dbcase2.js
- jstests/core/no_db_created.js
- # Views tests aren't expected to work when collections are implicitly sharded.
- - jstests/core/views/*.js
- jstests/core/killop_drop_collection.js # Uses fsyncLock.
# Tests that need triaging & remediation | blacklist decision
# Comments list possible problem point under review.
diff --git a/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml
index a44eb8aceb6..e2148ebcb6b 100644
--- a/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml
@@ -20,7 +20,6 @@ selector:
- jstests/core/currentop.js # uses fsync.
- jstests/core/dbhash.js # dbhash.
- jstests/core/dbhash2.js # dbhash.
- - jstests/core/diagdata.js # Command not supported in mongos
- jstests/core/dropdb_race.js # syncdelay.
- jstests/core/fsync.js # uses fsync.
- jstests/core/geo_s2cursorlimitskip.js # profiling.
@@ -54,7 +53,6 @@ selector:
- jstests/core/dbcase.js
- jstests/core/dbcase2.js
- jstests/core/no_db_created.js
- - jstests/core/views/*.js # Views tests aren't expected to work when collections are implicitly sharded.
- jstests/core/killop_drop_collection.js # Uses fsyncLock.
# These tests fail because sharded clusters do not clean up correctly after failed index builds.
# See SERVER-33207 as an example.
diff --git a/buildscripts/resmokeconfig/suites/sharded_multi_stmt_txn_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/sharded_multi_stmt_txn_jscore_passthrough.yml
index 7f9b4e35559..be1a33744a2 100644
--- a/buildscripts/resmokeconfig/suites/sharded_multi_stmt_txn_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/sharded_multi_stmt_txn_jscore_passthrough.yml
@@ -16,7 +16,6 @@ selector:
- jstests/core/currentop.js # uses fsync.
- jstests/core/dbhash.js # dbhash.
- jstests/core/dbhash2.js # dbhash.
- - jstests/core/diagdata.js # Command not supported in mongos
- jstests/core/dropdb_race.js # syncdelay.
- jstests/core/fsync.js # uses fsync.
- jstests/core/geo_s2cursorlimitskip.js # profiling.
diff --git a/buildscripts/resmokeconfig/suites/sharding_jscore_op_query_passthrough.yml b/buildscripts/resmokeconfig/suites/sharding_jscore_op_query_passthrough.yml
index fe8a01d3074..7cba9b9c5c2 100644
--- a/buildscripts/resmokeconfig/suites/sharding_jscore_op_query_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_jscore_op_query_passthrough.yml
@@ -18,7 +18,6 @@ selector:
- jstests/core/currentop.js # uses fsync.
- jstests/core/dbhash.js # dbhash.
- jstests/core/dbhash2.js # dbhash.
- - jstests/core/diagdata.js # Command not supported in mongos
- jstests/core/dropdb_race.js # syncdelay.
- jstests/core/fsync.js # uses fsync.
- jstests/core/geo_s2cursorlimitskip.js # profiling.
diff --git a/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml
index 2b4d84e0db5..8df5d287096 100644
--- a/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml
@@ -19,7 +19,6 @@ selector:
- jstests/core/currentop.js # uses fsync.
- jstests/core/dbhash.js # dbhash.
- jstests/core/dbhash2.js # dbhash.
- - jstests/core/diagdata.js # Command not supported in mongos
- jstests/core/dropdb_race.js # syncdelay.
- jstests/core/fsync.js # uses fsync.
- jstests/core/geo_s2cursorlimitskip.js # profiling.
diff --git a/buildscripts/resmokeconfig/suites/sharding_update_v1_oplog_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/sharding_update_v1_oplog_jscore_passthrough.yml
index 8f25b1b13ac..43975eb2988 100644
--- a/buildscripts/resmokeconfig/suites/sharding_update_v1_oplog_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_update_v1_oplog_jscore_passthrough.yml
@@ -18,7 +18,6 @@ selector:
- jstests/core/currentop.js # uses fsync.
- jstests/core/dbhash.js # dbhash.
- jstests/core/dbhash2.js # dbhash.
- - jstests/core/diagdata.js # Command not supported in mongos
- jstests/core/dropdb_race.js # syncdelay.
- jstests/core/fsync.js # uses fsync.
- jstests/core/geo_s2cursorlimitskip.js # profiling.
diff --git a/jstests/core/diagdata.js b/jstests/core/diagdata.js
index 2f2c224304e..15b47b591f4 100644
--- a/jstests/core/diagdata.js
+++ b/jstests/core/diagdata.js
@@ -1,8 +1,13 @@
-// Test that verifies getDiagnosticData returns FTDC data
-// @tags: [
-// # getDiagnosticData command is not available on embedded
-// incompatible_with_embedded,
-// ]
+/*
+ * Test that verifies getDiagnosticData returns FTDC data
+ *
+ * @tags: [
+ * # getDiagnosticData command is not available on embedded
+ * incompatible_with_embedded,
+ * # getDiagnosticData is not supported on mongos
+ * assumes_against_mongod_not_mongos,
+ * ]
+ */
load('jstests/libs/ftdc.js');
diff --git a/jstests/core/views/dbref_projection.js b/jstests/core/views/dbref_projection.js
index 1aa828c3807..b47bcfa8d32 100644
--- a/jstests/core/views/dbref_projection.js
+++ b/jstests/core/views/dbref_projection.js
@@ -3,6 +3,7 @@
*
* Legacy find() queries do not support views, so must use the find() command.
* @tags: [
+ * assumes_unsharded_collection,
* requires_find_command,
* ]
*/
diff --git a/jstests/core/views/duplicate_ns.js b/jstests/core/views/duplicate_ns.js
index 069790948a8..a016a975c9a 100644
--- a/jstests/core/views/duplicate_ns.js
+++ b/jstests/core/views/duplicate_ns.js
@@ -2,6 +2,7 @@
* Tests the creation of view with a duplicate name to a collection.
*
* @tags: [
+ * assumes_unsharded_collection,
* assumes_against_mongod_not_mongos,
* assumes_superuser_permissions,
* # applyOps is not retryable.
diff --git a/jstests/core/views/invalid_system_views.js b/jstests/core/views/invalid_system_views.js
index 4d2cf803369..25e973ed9a1 100644
--- a/jstests/core/views/invalid_system_views.js
+++ b/jstests/core/views/invalid_system_views.js
@@ -3,6 +3,7 @@
* collections.
*
* @tags: [
+ * assumes_unsharded_collection,
* # applyOps is not available on mongos.
* assumes_against_mongod_not_mongos,
* assumes_superuser_permissions,
diff --git a/jstests/core/views/view_with_invalid_dbname.js b/jstests/core/views/view_with_invalid_dbname.js
index a4e0c126193..c31f1c5c8cf 100644
--- a/jstests/core/views/view_with_invalid_dbname.js
+++ b/jstests/core/views/view_with_invalid_dbname.js
@@ -5,6 +5,7 @@
* embedded null character (SERVER-36859).
*
* @tags: [
+ * assumes_unsharded_collection,
* # applyOps is not available on mongos.
* assumes_against_mongod_not_mongos,
* # applyOps is not retryable.
diff --git a/jstests/core/views/views_aggregation.js b/jstests/core/views/views_aggregation.js
index 5d2d7e0b117..d0752b6948a 100644
--- a/jstests/core/views/views_aggregation.js
+++ b/jstests/core/views/views_aggregation.js
@@ -2,6 +2,7 @@
* Tests aggregation on views for proper pipeline concatenation and semantics.
*
* @tags: [
+ * assumes_unsharded_collection,
* does_not_support_stepdowns,
* does_not_support_transactions,
* requires_find_command,
diff --git a/jstests/core/views/views_all_commands.js b/jstests/core/views/views_all_commands.js
index 617783b1bda..9501d9a57eb 100644
--- a/jstests/core/views/views_all_commands.js
+++ b/jstests/core/views/views_all_commands.js
@@ -1,4 +1,5 @@
// @tags: [
+// assumes_unsharded_collection,
// assumes_superuser_permissions,
// does_not_support_stepdowns,
// requires_emptycapped,
diff --git a/jstests/core/views/views_basic.js b/jstests/core/views/views_basic.js
index 0b4dcda6001..6e66b637f72 100644
--- a/jstests/core/views/views_basic.js
+++ b/jstests/core/views/views_basic.js
@@ -1,4 +1,10 @@
-// Tests basic functionality of read-only, non-materialized views.
+/**
+ * Tests basic functionality of read-only, non-materialized views.
+ *
+ * @tags: [
+ * assumes_unsharded_collection,
+ * ]
+ */
(function() {
"use strict";
diff --git a/jstests/core/views/views_change.js b/jstests/core/views/views_change.js
index acb8253b963..d23b7c8805e 100644
--- a/jstests/core/views/views_change.js
+++ b/jstests/core/views/views_change.js
@@ -1,6 +1,7 @@
/**
* Tests the behavior of views when the backing view or collection is changed.
* @tags: [
+ * assumes_unsharded_collection,
* assumes_superuser_permissions,
* requires_find_command,
* requires_non_retryable_commands,
diff --git a/jstests/core/views/views_coll_stats.js b/jstests/core/views/views_coll_stats.js
index cb09c41bb70..c02f9c76c06 100644
--- a/jstests/core/views/views_coll_stats.js
+++ b/jstests/core/views/views_coll_stats.js
@@ -1,4 +1,11 @@
-// Test that $collStats works on a view and in view pipelines as expected.
+/**
+ * Test that $collStats works on a view and in view pipelines as expected.
+ *
+ * @tags: [
+ * assumes_unsharded_collection,
+ * ]
+ */
+
(function() {
"use strict";
diff --git a/jstests/core/views/views_collation.js b/jstests/core/views/views_collation.js
index 13e501c920c..2a7fa6ee596 100644
--- a/jstests/core/views/views_collation.js
+++ b/jstests/core/views/views_collation.js
@@ -1,4 +1,5 @@
// @tags: [
+// assumes_unsharded_collection,
// does_not_support_stepdowns,
// requires_fastcount,
// requires_non_retryable_commands,
diff --git a/jstests/core/views/views_count.js b/jstests/core/views/views_count.js
index 0cdaad0eb46..125e6e1c0ab 100644
--- a/jstests/core/views/views_count.js
+++ b/jstests/core/views/views_count.js
@@ -1,6 +1,7 @@
// Test the count command with views.
//
// @tags: [
+// assumes_unsharded_collection,
// requires_fastcount,
// ]
diff --git a/jstests/core/views/views_creation.js b/jstests/core/views/views_creation.js
index 7c211b801d4..2b5316ad400 100644
--- a/jstests/core/views/views_creation.js
+++ b/jstests/core/views/views_creation.js
@@ -2,6 +2,7 @@
* Test the creation of views with various options.
*
* @tags: [
+ * assumes_unsharded_collection,
* # applyOps is not available on mongos.
* assumes_against_mongod_not_mongos,
* assumes_superuser_permissions,
diff --git a/jstests/core/views/views_distinct.js b/jstests/core/views/views_distinct.js
index 0f25ac3beb1..2d996b04da4 100644
--- a/jstests/core/views/views_distinct.js
+++ b/jstests/core/views/views_distinct.js
@@ -1,4 +1,11 @@
-// Test the distinct command with views.
+/**
+ * Test the distinct command with views.
+ *
+ * @tags: [
+ * assumes_unsharded_collection,
+ * ]
+ */
+
(function() {
"use strict";
diff --git a/jstests/core/views/views_drop.js b/jstests/core/views/views_drop.js
index c1e6b20cf30..5af99dddb55 100644
--- a/jstests/core/views/views_drop.js
+++ b/jstests/core/views/views_drop.js
@@ -2,6 +2,7 @@
* Tests the behavior of views when its backing collection is dropped, as well as the behavior of
* system.views when views are dropped.
* @tags: [
+ * assumes_unsharded_collection,
* assumes_superuser_permissions,
* requires_find_command,
* ]
diff --git a/jstests/core/views/views_find.js b/jstests/core/views/views_find.js
index 3ca5571784d..a4b763ce7a5 100644
--- a/jstests/core/views/views_find.js
+++ b/jstests/core/views/views_find.js
@@ -2,6 +2,7 @@
* Tests the find command on views.
*
* @tags: [
+ * assumes_unsharded_collection,
* requires_find_command,
* requires_getmore,
* ]
diff --git a/jstests/core/views/views_stats.js b/jstests/core/views/views_stats.js
index 26ce01381e9..90413112640 100644
--- a/jstests/core/views/views_stats.js
+++ b/jstests/core/views/views_stats.js
@@ -6,7 +6,7 @@
//
// @tags: [
// assumes_read_preference_unchanged,
-//
+// assumes_unsharded_collection,
// # top command is not available on embedded
// incompatible_with_embedded,
// ]
diff --git a/jstests/core/views/views_validation.js b/jstests/core/views/views_validation.js
index a9ac74ee1ca..cf3069365ec 100644
--- a/jstests/core/views/views_validation.js
+++ b/jstests/core/views/views_validation.js
@@ -1,4 +1,5 @@
// @tags: [
+// assumes_unsharded_collection,
// requires_non_retryable_commands,
// requires_fcv_49
// ]