SERVER-112544 Rename addShard and removeShard test to have a consistent naming (#43132)

GitOrigin-RevId: 2d0dbb9cb6997c7918960feea9d81a5d0e64a6f3

.github/CODEOWNERS

@@ -1528,7 +1528,7 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot
 /jstests/sharding/**/*txn* @10gen/server-transactions @svc-auto-approve-bot
 /jstests/sharding/**/*_with_id_without_shard_key* @10gen/server-cluster-scalability @svc-auto-approve-bot
 /jstests/sharding/**/*zone* @10gen/server-cluster-scalability @svc-auto-approve-bot
-/jstests/sharding/**/addShard* @10gen/server-catalog-and-routing-routing-and-topology @svc-auto-approve-bot
+/jstests/sharding/**/add_shard_* @10gen/server-catalog-and-routing-routing-and-topology @svc-auto-approve-bot
 /jstests/sharding/**/custom_write_concern.js @10gen/server-catalog-and-routing @svc-auto-approve-bot
 /jstests/sharding/**/shard_unsplittable_collection.js @10gen/server-catalog-and-routing-ddl @svc-auto-approve-bot
 /jstests/sharding/**/create_unsplittable_collection.js @10gen/server-catalog-and-routing-ddl @svc-auto-approve-bot
@@ -1540,7 +1540,6 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot
 /jstests/sharding/**/replica_set_to_csrs_promotion.js @10gen/server-catalog-and-routing-routing-and-topology @svc-auto-approve-bot
 /jstests/sharding/**/replica_set_promotion_demotion.js @10gen/server-catalog-and-routing-routing-and-topology @svc-auto-approve-bot
 /jstests/sharding/**/stop_shard_draining_test.js @10gen/server-catalog-and-routing-routing-and-topology @svc-auto-approve-bot
-/jstests/sharding/**/remove_shard_interoperability_tests.js @10gen/server-catalog-and-routing-routing-and-topology @svc-auto-approve-bot
 /jstests/sharding/**/commit_shard_removal_test.js @10gen/server-catalog-and-routing-routing-and-topology @svc-auto-approve-bot
 /jstests/sharding/**/validate_collection*.js @10gen/server-catalog-and-routing-shard-catalog @svc-auto-approve-bot
 /jstests/sharding/**/add_and_remove_shard_serializes_with_ddl.js @10gen/server-catalog-and-routing-routing-and-topology @svc-auto-approve-bot
@@ -1554,8 +1553,8 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot
 /jstests/sharding/**/safe_secondary_reads_drop_recreate.js @10gen/server-catalog-and-routing @svc-auto-approve-bot
 /jstests/sharding/**/safe_secondary_reads_single_migration_waitForDelete.js @10gen/server-catalog-and-routing @svc-auto-approve-bot
 /jstests/sharding/**/startup_with_all_configs_down.js @10gen/server-catalog-and-routing-routing-and-topology @svc-auto-approve-bot
-/jstests/sharding/**/addshard*.js @10gen/server-catalog-and-routing-routing-and-topology @svc-auto-approve-bot
 /jstests/sharding/**/safe_secondary_reads_causal_consistency.js @10gen/server-cluster-scalability @svc-auto-approve-bot
+/jstests/sharding/**/remove_shard_*.js @10gen/server-catalog-and-routing-routing-and-topology @svc-auto-approve-bot
 /jstests/sharding/**/reporting_compound_wildcard_index_prefixed_by_shard_key.js @10gen/server-catalog-and-routing-ddl @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/sharding/analyze_shard_key/OWNERS.yml

buildscripts/resmokeconfig/suites/sharding_csrs_continuous_config_stepdown.yml

@@ -27,8 +27,8 @@ selector:
     - jstests/sharding/advance_cluster_time_action_type.js
     - jstests/sharding/mongod_returns_no_cluster_time_without_keys.js
     # Count/write/aggregate commands against the config shard do not support retries yet
-    - jstests/sharding/addshard1.js
-    - jstests/sharding/addshard2.js
+    - jstests/sharding/add_shard_1.js
+    - jstests/sharding/add_shard_2.js
     - jstests/sharding/basic_merge.js
     - jstests/sharding/query/count/count1.js
     - jstests/sharding/query/count/count2.js
@@ -51,7 +51,7 @@ selector:
     - jstests/sharding/prefix_shard_key.js
     - jstests/sharding/query/query_config.js
     - jstests/sharding/range_deleter_interacts_correctly_with_refine_shard_key.js
-    - jstests/sharding/remove1.js
+    - jstests/sharding/remove_shard_1.js
     - jstests/sharding/shard2.js
     - jstests/sharding/shard3.js
     - jstests/sharding/tag_range.js
@@ -71,7 +71,7 @@ selector:
     - jstests/sharding/catalog_shard_mongos_ops_on_config_and_admin.js
     # Balancer writes (direct write to config database with no retries)
     - jstests/sharding/convert_to_and_from_sharded.js
-    - jstests/sharding/remove2.js
+    - jstests/sharding/remove_shard_2.js
     - jstests/sharding/features3.js
     - jstests/sharding/query/in_memory_sort_limit.js
     - jstests/sharding/parallel.js
@@ -163,16 +163,16 @@ selector:
     # it may not be sent if the config server primary steps down just before sending it.
     - jstests/sharding/database_versioning_all_commands.js
     # Calls removeShard/removeshard which is not idempotent and these tests expect it to be run an exact number of times
-    - jstests/sharding/addshard5.js
+    - jstests/sharding/add_shard_5.js
     - jstests/sharding/auth_add_shard.js
-    - jstests/sharding/remove3.js
+    - jstests/sharding/remove_shard_3.js
     - jstests/sharding/authCommands.js
-    #  - jstests/sharding/addshard2.js
+    #  - jstests/sharding/add_shard_2.js
     #  - jstests/sharding/configsvr_metadata_commands_require_majority_write_concern.js
     #  - jstests/sharding/convert_to_and_from_sharded.js
     #  - jstests/sharding/names.js
-    #  - jstests/sharding/remove1.js
-    #  - jstests/sharding/remove2.js
+    #  - jstests/sharding/remove_shard_1.js
+    #  - jstests/sharding/remove_shard_2.js
 
     # Moves a chunk before continuing a transaction, which can lead to snapshot errors if the
     # CSRS failovers are sufficiently slow.

jstests/sharding/OWNERS.yml

@@ -49,7 +49,7 @@ filters:
   - "*zone*":
     approvers:
       - 10gen/server-cluster-scalability
-  - "addShard*":
+  - "add_shard_*":
     approvers:
       - 10gen/server-catalog-and-routing-routing-and-topology
   - "custom_write_concern.js":
@@ -85,9 +85,6 @@ filters:
   - "stop_shard_draining_test.js":
     approvers:
       - 10gen/server-catalog-and-routing-routing-and-topology
-  - "remove_shard_interoperability_tests.js":
-    approvers:
-      - 10gen/server-catalog-and-routing-routing-and-topology
   - "commit_shard_removal_test.js":
     approvers:
       - 10gen/server-catalog-and-routing-routing-and-topology
@@ -127,12 +124,12 @@ filters:
   - "startup_with_all_configs_down.js":
     approvers:
       - 10gen/server-catalog-and-routing-routing-and-topology
-  - "addshard*.js":
-    approvers:
-      - 10gen/server-catalog-and-routing-routing-and-topology
   - "safe_secondary_reads_causal_consistency.js":
     approvers:
       - 10gen/server-cluster-scalability
+  - "remove_shard_*.js":
+    approvers:
+      - 10gen/server-catalog-and-routing-routing-and-topology
   - "reporting_compound_wildcard_index_prefixed_by_shard_key.js":
     approvers:
       - 10gen/server-catalog-and-routing-ddl

jstests/sharding/add_shard_2.js

@@ -58,7 +58,7 @@ const st = new ShardingTest({
 });
 
 // Add one shard since the last shard cannot be removed.
-const normalShard = new ReplSetTest({name: "addshard2-1", nodes: 1, nodeOptions: {shardsvr: ""}});
+const normalShard = new ReplSetTest({name: "add_shard_2-1", nodes: 1, nodeOptions: {shardsvr: ""}});
 normalShard.startSet();
 normalShard.initiate();