From dbf4de19b4419fd8a3361aeb88502dae39c11d35 Mon Sep 17 00:00:00 2001 From: dspeck Date: Fri, 22 Nov 2024 16:58:37 +0000 Subject: [PATCH] Remove SSH runnable. GCP Batch natively allows SSH access to VMs as long as the user has permissions. --- .../backend/google/batch/api/GcpBatchRequestFactoryImpl.scala | 2 -- .../cromwell/backend/google/batch/runnable/RunnableUtils.scala | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/supportedBackends/google/batch/src/main/scala/cromwell/backend/google/batch/api/GcpBatchRequestFactoryImpl.scala b/supportedBackends/google/batch/src/main/scala/cromwell/backend/google/batch/api/GcpBatchRequestFactoryImpl.scala index 27c8e104699..1b7577c6f16 100644 --- a/supportedBackends/google/batch/src/main/scala/cromwell/backend/google/batch/api/GcpBatchRequestFactoryImpl.scala +++ b/supportedBackends/google/batch/src/main/scala/cromwell/backend/google/batch/api/GcpBatchRequestFactoryImpl.scala @@ -231,7 +231,6 @@ class GcpBatchRequestFactoryImpl()(implicit gcsTransferConfiguration: GcsTransfe val monitoringShutdown: List[Runnable] = monitoringShutdownRunnables(createParameters) val checkpointingStart: List[Runnable] = checkpointingSetupRunnables(createParameters, allVolumes) val checkpointingShutdown: List[Runnable] = checkpointingShutdownRunnables(createParameters, allVolumes) - val sshAccess: List[Runnable] = List.empty // sshAccessActions(createPipelineParameters, mounts) val sortedRunnables: List[Runnable] = RunnableUtils.sortRunnables( containerSetup = containerSetup, @@ -243,7 +242,6 @@ class GcpBatchRequestFactoryImpl()(implicit gcsTransferConfiguration: GcsTransfe monitoringShutdown = monitoringShutdown, checkpointingStart = checkpointingStart, checkpointingShutdown = checkpointingShutdown, - sshAccess = sshAccess, isBackground = _.getBackground ) diff --git a/supportedBackends/google/batch/src/main/scala/cromwell/backend/google/batch/runnable/RunnableUtils.scala b/supportedBackends/google/batch/src/main/scala/cromwell/backend/google/batch/runnable/RunnableUtils.scala index 8aa1865ed3a..5af320ada8e 100644 --- a/supportedBackends/google/batch/src/main/scala/cromwell/backend/google/batch/runnable/RunnableUtils.scala +++ b/supportedBackends/google/batch/src/main/scala/cromwell/backend/google/batch/runnable/RunnableUtils.scala @@ -49,7 +49,6 @@ object RunnableUtils { monitoringShutdown: List[Runnable], checkpointingStart: List[Runnable], checkpointingShutdown: List[Runnable], - sshAccess: List[Runnable], isBackground: Runnable => Boolean ): List[Runnable] = { val toBeSortedRunnables = localization ++ userRunnable ++ memoryRetryRunnable ++ deLocalization @@ -57,6 +56,6 @@ object RunnableUtils { isBackground(runnable) } - sshAccess ++ containerSetup ++ monitoringSetup ++ checkpointingStart ++ sortedRunnables ++ checkpointingShutdown ++ monitoringShutdown + containerSetup ++ monitoringSetup ++ checkpointingStart ++ sortedRunnables ++ checkpointingShutdown ++ monitoringShutdown } }