SERVER-54602 Fix and enable powercycle_kill_mongod on Windows buildvariant

buildscripts/resmokelib/powercycle/powercycle.py

@@ -1649,9 +1649,11 @@ def setup_ssh_tunnel(  # pylint: disable=too-many-arguments
     ssh_tunnel_cmd = f"ssh -N {ssh_tunnel_opts} {ssh_connection_options} {ssh_options} {ssh_user_host}"
     LOGGER.info("Tunneling mongod connections through ssh to get around firewall")
     LOGGER.info(ssh_tunnel_cmd)
-    Processes.create(ssh_tunnel_cmd)
+    ssh_tunnel_proc = start_cmd(ssh_tunnel_cmd)
     LOGGER.info("The connection is not terminated because the host can be shut down at anytime")
 
+    return ssh_tunnel_proc
+
 
 def get_remote_python():
     """Return remote python."""
@@ -1891,8 +1893,8 @@ def main(parser_actions, options):  # pylint: disable=too-many-branches,too-many
         if ret:
             local_exit(ret)
 
-        setup_ssh_tunnel(mongod_host, secret_port, standard_port, ssh_connection_options,
-                         ssh_options, ssh_user_host)
+        ssh_tunnel_proc = setup_ssh_tunnel(mongod_host, secret_port, standard_port,
+                                           ssh_connection_options, ssh_options, ssh_user_host)
 
         # Optionally validate canary document locally.
         if validate_canary_local:
@@ -2008,6 +2010,7 @@ def main(parser_actions, options):  # pylint: disable=too-many-branches,too-many
         Processes.kill_all()
         for temp_file in temp_client_files:
             NamedTempFile.delete(temp_file)
+        kill_process(ssh_tunnel_proc)
 
         # Reestablish remote access after crash.
         local_ops = LocalToRemoteOperations(user_host=ssh_user_host,

etc/evergreen.yml

@@ -7240,6 +7240,7 @@ tasks:
     timeout_secs: 1800 # 30 minute timeout for no output
 
 - name: powercycle_kill_mongod
+  tags: ["powercycle"]
   exec_timeout_secs: 7200 # 2 hour timeout for the task overall
   depends_on:
   - name: archive_dist_test_debug
@@ -8782,9 +8783,6 @@ buildvariants:
   - name: .powercycle
     distros:
     - ubuntu1604-powercycle
-  - name: powercycle_kill_mongod
-    distros:
-    - ubuntu1604-powercycle
   - name: powercycle_replication_smalloplog
     distros:
     - ubuntu1604-powercycle