SERVER-89414 Harden shard removal in a `store_historical_placement_data.js` test teardown (#21129)r7.3.2-rc0

GitOrigin-RevId: a5f64e2e2147f5a8300542bee986ce6b840d65d0

1 files changed, 2 insertions, 8 deletions

diff --git a/jstests/sharding/store_historical_placement_data.js b/jstests/sharding/store_historical_placement_data.js
index 6658439a756..ddb4f47bf4c 100644
--- a/jstests/sharding/store_historical_placement_data.js
+++ b/jstests/sharding/store_historical_placement_data.js
@@ -1,4 +1,5 @@
 import {FeatureFlagUtil} from "jstests/libs/feature_flag_util.js";
+import {removeShard} from "jstests/sharding/libs/remove_shard_util.js";
 
 const st = new ShardingTest({
     shards: 3,
@@ -403,14 +404,7 @@ function testAddShard() {
     for (const dbName of dbsOnNewReplicaSet) {
         assert.commandWorked(st.getDB(dbName).dropDatabase());
     }
-
-    let res = assert.commandWorked(st.s.adminCommand({removeShard: newShardName}));
-    if (res.state === 'started') {
-        // Issue a second removeShard request to sync on the full removal of the targeted RS.
-        res = assert.commandWorked(st.s.adminCommand({removeShard: newShardName}));
-    }
-
-    assert.eq('completed', res.state);
+    removeShard(st, newShardName);
     newReplicaSet.stopSet();
 }