From 36d26fe2c5f6fc3c713c6da70ed211995de12cbd Mon Sep 17 00:00:00 2001 From: Adam Nichols Date: Wed, 15 May 2024 21:18:31 -0400 Subject: [PATCH 1/3] Add more cases to `GCPBatch` backend --- .../resources/standardTestCases/abort.restart_abort_jes.test | 2 +- .../standardTestCases/bucket_name_with_no_trailing_slash.test | 2 +- ..._cache_hit_prefixes_two_roots_empty_hint_cache_hit_papi.test | 2 +- .../main/resources/standardTestCases/collections_delete.test | 2 +- .../resources/standardTestCases/docker_hash_gcr_private.test | 2 +- .../standardTestCases/draft3_call_cache_capoeira_jes.test | 2 +- .../resources/standardTestCases/draft3_custom_mount_point.test | 2 +- .../main/resources/standardTestCases/error_10_preemptible.test | 2 +- .../resources/standardTestCases/final_call_logs_dir_jes.test | 2 +- .../standardTestCases/gcs_path_ending_with_newline.test | 2 +- .../src/main/resources/standardTestCases/google_labels_bad.test | 2 +- .../src/main/resources/standardTestCases/gpu_cuda_image.test | 2 +- .../main/resources/standardTestCases/gpu_on_papi_invalid.test | 2 +- centaur/src/main/resources/standardTestCases/hello_delete.test | 2 +- .../hello_google_legacy_machine_selection.test | 2 +- centaur/src/main/resources/standardTestCases/http_inputs.test | 2 +- .../src/main/resources/standardTestCases/input_expressions.test | 2 +- .../resources/standardTestCases/invalidate_bad_caches_jes.test | 2 +- centaur/src/main/resources/standardTestCases/jes_labels.test | 2 +- centaur/src/main/resources/standardTestCases/local_gcs.test | 2 +- .../main/resources/standardTestCases/lots_of_inputs_papiv2.test | 2 +- .../src/main/resources/standardTestCases/missing_delete.test | 2 +- .../monitoring_script_localization_failure.test | 2 +- .../src/main/resources/standardTestCases/no_output_delete.test | 2 +- .../src/main/resources/standardTestCases/papi_cpu_platform.test | 2 +- .../standardTestCases/papi_preemptible_and_max_retries.test | 2 +- centaur/src/main/resources/standardTestCases/papi_v2_log.test | 2 +- .../standardTestCases/restart.restart_jes_with_recover.test | 2 +- .../resources/standardTestCases/retry_with_more_memory.test | 2 +- .../src/main/resources/standardTestCases/scatter_delete.test | 2 +- centaur/src/main/resources/standardTestCases/stdout_delete.test | 2 +- .../main/resources/standardTestCases/sub_workflow_delete.test | 2 +- .../standardTestCases/wdl_optional_outputs_unsupported.test | 2 +- .../workbench_health_monitor_check_papiv2.test | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) diff --git a/centaur/src/main/resources/standardTestCases/abort.restart_abort_jes.test b/centaur/src/main/resources/standardTestCases/abort.restart_abort_jes.test index 80192065e6c..e694c69f5c4 100644 --- a/centaur/src/main/resources/standardTestCases/abort.restart_abort_jes.test +++ b/centaur/src/main/resources/standardTestCases/abort.restart_abort_jes.test @@ -2,7 +2,7 @@ ignore: false name: abort.restart_abort_jes testFormat: ScheduledAbortWithRestart callMark: scheduled_abort.aborted -backends: [Papi] +backends: [GCPBatch, Papi] files { workflow: abort/scheduled_abort.wdl diff --git a/centaur/src/main/resources/standardTestCases/bucket_name_with_no_trailing_slash.test b/centaur/src/main/resources/standardTestCases/bucket_name_with_no_trailing_slash.test index a7de7263245..bf7c72ccdab 100644 --- a/centaur/src/main/resources/standardTestCases/bucket_name_with_no_trailing_slash.test +++ b/centaur/src/main/resources/standardTestCases/bucket_name_with_no_trailing_slash.test @@ -1,6 +1,6 @@ name: bucket_name_with_no_trailing_slash testFormat: workflowfailure -backends: [Papiv2] +backends: [GCPBatch, Papiv2] files { workflow: attempt_to_localize_bucket_as_file/attempt_to_localize_bucket_as_file.wdl diff --git a/centaur/src/main/resources/standardTestCases/call_cache_hit_prefixes_two_roots_empty_hint_cache_hit_papi.test b/centaur/src/main/resources/standardTestCases/call_cache_hit_prefixes_two_roots_empty_hint_cache_hit_papi.test index a0ef536165e..30ce550842f 100644 --- a/centaur/src/main/resources/standardTestCases/call_cache_hit_prefixes_two_roots_empty_hint_cache_hit_papi.test +++ b/centaur/src/main/resources/standardTestCases/call_cache_hit_prefixes_two_roots_empty_hint_cache_hit_papi.test @@ -3,7 +3,7 @@ # should not see the first's cache entries. name: call_cache_hit_prefixes_two_roots_empty_hint_cache_hit_papi testFormat: runthriceexpectingcallcaching -backends: [Papi] +backends: [GCPBatch, Papi] files { workflow: call_cache_hit_prefixes/call_cache_hit_prefixes.wdl diff --git a/centaur/src/main/resources/standardTestCases/collections_delete.test b/centaur/src/main/resources/standardTestCases/collections_delete.test index 3f01be2d295..48f3c1d2c77 100644 --- a/centaur/src/main/resources/standardTestCases/collections_delete.test +++ b/centaur/src/main/resources/standardTestCases/collections_delete.test @@ -2,7 +2,7 @@ name: collections_delete testFormat: workflowsuccess -backends: [Papiv2] +backends: [GCPBatch, Papiv2] files { workflow: delete_intermediates/collections_delete.wdl diff --git a/centaur/src/main/resources/standardTestCases/docker_hash_gcr_private.test b/centaur/src/main/resources/standardTestCases/docker_hash_gcr_private.test index 45d7e377e2a..02c91bec00f 100644 --- a/centaur/src/main/resources/standardTestCases/docker_hash_gcr_private.test +++ b/centaur/src/main/resources/standardTestCases/docker_hash_gcr_private.test @@ -1,6 +1,6 @@ name: docker_hash_gcr_private testFormat: workflowsuccess -backends: [Papi] +backends: [GCPBatch, Papi] files { workflow: docker_hash/docker_hash_gcr_private.wdl diff --git a/centaur/src/main/resources/standardTestCases/draft3_call_cache_capoeira_jes.test b/centaur/src/main/resources/standardTestCases/draft3_call_cache_capoeira_jes.test index 0f8526d54d8..382d51b0b4b 100644 --- a/centaur/src/main/resources/standardTestCases/draft3_call_cache_capoeira_jes.test +++ b/centaur/src/main/resources/standardTestCases/draft3_call_cache_capoeira_jes.test @@ -1,6 +1,6 @@ name: draft3_call_cache_capoeira_jes testFormat: workflowsuccess -backends: [Papi, Local] +backends: [GCPBatch, Papi, Local] workflowType: WDL workflowTypeVersion: 1.0 tags: ["wdl_1.0"] diff --git a/centaur/src/main/resources/standardTestCases/draft3_custom_mount_point.test b/centaur/src/main/resources/standardTestCases/draft3_custom_mount_point.test index ca26105560f..70fcb1ac0d5 100644 --- a/centaur/src/main/resources/standardTestCases/draft3_custom_mount_point.test +++ b/centaur/src/main/resources/standardTestCases/draft3_custom_mount_point.test @@ -1,6 +1,6 @@ name: draft3_custom_mount_point testFormat: workflowsuccess -backends: [Papi] +backends: [GCPBatch, Papi] files { workflow: wdl_draft3/custom_mount_point/custom_mount_point.wdl diff --git a/centaur/src/main/resources/standardTestCases/error_10_preemptible.test b/centaur/src/main/resources/standardTestCases/error_10_preemptible.test index ea4cd5bf375..bd2d3f1baa8 100644 --- a/centaur/src/main/resources/standardTestCases/error_10_preemptible.test +++ b/centaur/src/main/resources/standardTestCases/error_10_preemptible.test @@ -1,6 +1,6 @@ name: error_10_preemptible testFormat: workflowsuccess -backends: [Papiv2] +backends: [GCPBatch, Papiv2] files { workflow: error_10_preemptible/error_10_preemptible.wdl diff --git a/centaur/src/main/resources/standardTestCases/final_call_logs_dir_jes.test b/centaur/src/main/resources/standardTestCases/final_call_logs_dir_jes.test index d983a315384..ac8c068e1ef 100644 --- a/centaur/src/main/resources/standardTestCases/final_call_logs_dir_jes.test +++ b/centaur/src/main/resources/standardTestCases/final_call_logs_dir_jes.test @@ -1,7 +1,7 @@ # Tests that a runtime option to save call logs is copying said logs appropriately. name: final_call_logs_dir_jes -backends: [Papi] +backends: [GCPBatch, Papi] testFormat: workflowsuccess diff --git a/centaur/src/main/resources/standardTestCases/gcs_path_ending_with_newline.test b/centaur/src/main/resources/standardTestCases/gcs_path_ending_with_newline.test index cc0cd9d31d2..6a3b4d5e2d6 100644 --- a/centaur/src/main/resources/standardTestCases/gcs_path_ending_with_newline.test +++ b/centaur/src/main/resources/standardTestCases/gcs_path_ending_with_newline.test @@ -1,6 +1,6 @@ name: gcs_path_ending_with_newline testFormat: workflowsuccess -backends: [Papiv2] +backends: [GCPBatch, Papiv2] files { workflow: gcs_path_ending_with_newline/gcs_path_ending_with_newline.wdl diff --git a/centaur/src/main/resources/standardTestCases/google_labels_bad.test b/centaur/src/main/resources/standardTestCases/google_labels_bad.test index 720f8a18050..50ac35d2aa0 100644 --- a/centaur/src/main/resources/standardTestCases/google_labels_bad.test +++ b/centaur/src/main/resources/standardTestCases/google_labels_bad.test @@ -1,6 +1,6 @@ name: google_labels_bad testFormat: workflowfailure -backends: [Papiv2] +backends: [GCPBatch, Papiv2] files { workflow: google_labels/google_labels.wdl diff --git a/centaur/src/main/resources/standardTestCases/gpu_cuda_image.test b/centaur/src/main/resources/standardTestCases/gpu_cuda_image.test index b5addf6e6ca..591d1d2d960 100644 --- a/centaur/src/main/resources/standardTestCases/gpu_cuda_image.test +++ b/centaur/src/main/resources/standardTestCases/gpu_cuda_image.test @@ -1,6 +1,6 @@ name: gpu_cuda_image testFormat: workflowsuccess -backends: [Papi] +backends: [GCPBatch, Papi] ignore: true files { diff --git a/centaur/src/main/resources/standardTestCases/gpu_on_papi_invalid.test b/centaur/src/main/resources/standardTestCases/gpu_on_papi_invalid.test index 3923a73b687..1de978fe33f 100644 --- a/centaur/src/main/resources/standardTestCases/gpu_on_papi_invalid.test +++ b/centaur/src/main/resources/standardTestCases/gpu_on_papi_invalid.test @@ -1,6 +1,6 @@ name: gpu_on_papi_invalid testFormat: workflowfailure -backends: [Papi] +backends: [GCPBatch, Papi] files { workflow: gpu_on_papi/gpu_on_papi.wdl diff --git a/centaur/src/main/resources/standardTestCases/hello_delete.test b/centaur/src/main/resources/standardTestCases/hello_delete.test index 95b5e839e92..556362aa26f 100644 --- a/centaur/src/main/resources/standardTestCases/hello_delete.test +++ b/centaur/src/main/resources/standardTestCases/hello_delete.test @@ -2,7 +2,7 @@ name: hello_delete testFormat: workflowsuccess -backends: [Papiv2] +backends: [GCPBatch, Papiv2] files { workflow: delete_intermediates/hello_delete.wdl diff --git a/centaur/src/main/resources/standardTestCases/hello_google_legacy_machine_selection.test b/centaur/src/main/resources/standardTestCases/hello_google_legacy_machine_selection.test index 1930c075c74..7c56eef77f0 100644 --- a/centaur/src/main/resources/standardTestCases/hello_google_legacy_machine_selection.test +++ b/centaur/src/main/resources/standardTestCases/hello_google_legacy_machine_selection.test @@ -1,6 +1,6 @@ name: hello_google_legacy_machine_selection testFormat: workflowsuccess -backends: [ Papiv2 ] +backends: [GCPBatch, Papiv2] files { workflow: wdl_draft3/hello/hello.wdl diff --git a/centaur/src/main/resources/standardTestCases/http_inputs.test b/centaur/src/main/resources/standardTestCases/http_inputs.test index fd80cc1e093..b1cce782728 100644 --- a/centaur/src/main/resources/standardTestCases/http_inputs.test +++ b/centaur/src/main/resources/standardTestCases/http_inputs.test @@ -1,5 +1,5 @@ name: http_inputs -backends: [Local, Papiv2] +backends: [GCPBatch, Local, Papiv2] testFormat: workflowsuccess skipDescribeEndpointValidation: true diff --git a/centaur/src/main/resources/standardTestCases/input_expressions.test b/centaur/src/main/resources/standardTestCases/input_expressions.test index f26a0a35aeb..f2104a83b8a 100644 --- a/centaur/src/main/resources/standardTestCases/input_expressions.test +++ b/centaur/src/main/resources/standardTestCases/input_expressions.test @@ -1,6 +1,6 @@ name: input_expressions testFormat: workflowsuccess -backends: [Papi, Local] +backends: [GCPBatch, Papi, Local] files { workflow: input_expressions/input_expressions.wdl diff --git a/centaur/src/main/resources/standardTestCases/invalidate_bad_caches_jes.test b/centaur/src/main/resources/standardTestCases/invalidate_bad_caches_jes.test index a09c834ff31..9e6997e0082 100644 --- a/centaur/src/main/resources/standardTestCases/invalidate_bad_caches_jes.test +++ b/centaur/src/main/resources/standardTestCases/invalidate_bad_caches_jes.test @@ -1,6 +1,6 @@ name: invalidate_bad_caches_jes testFormat: workflowsuccess -backends: [Papi] +backends: [GCPBatch, Papi] files { workflow: invalidate_bad_caches/invalidate_bad_caches.wdl diff --git a/centaur/src/main/resources/standardTestCases/jes_labels.test b/centaur/src/main/resources/standardTestCases/jes_labels.test index d2b9840972f..d383291b89a 100644 --- a/centaur/src/main/resources/standardTestCases/jes_labels.test +++ b/centaur/src/main/resources/standardTestCases/jes_labels.test @@ -1,7 +1,7 @@ name: jes_labels testFormat: workflowsuccess tags: [ labels ] -backends: [Papi] +backends: [GCPBatch, Papi] files { workflow: labels/jes_labels.wdl diff --git a/centaur/src/main/resources/standardTestCases/local_gcs.test b/centaur/src/main/resources/standardTestCases/local_gcs.test index 65687830344..ad9fef99184 100644 --- a/centaur/src/main/resources/standardTestCases/local_gcs.test +++ b/centaur/src/main/resources/standardTestCases/local_gcs.test @@ -1,6 +1,6 @@ name: local_gcs testFormat: workflowsuccess -backends: [Papi, Local] +backends: [GCPBatch, Papi, Local] files { workflow: local_gcs/local_gcs.wdl diff --git a/centaur/src/main/resources/standardTestCases/lots_of_inputs_papiv2.test b/centaur/src/main/resources/standardTestCases/lots_of_inputs_papiv2.test index a3ea44e0a95..ad2cdb32b7c 100644 --- a/centaur/src/main/resources/standardTestCases/lots_of_inputs_papiv2.test +++ b/centaur/src/main/resources/standardTestCases/lots_of_inputs_papiv2.test @@ -4,7 +4,7 @@ name: lots_of_inputs_papiv2 testFormat: workflowsuccess tags: [ big_metadata ] -backends: [ Papiv2 ] +backends: [GCPBatch, Papiv2] files { workflow: lots_of_inputs/lots_of_inputs.wdl diff --git a/centaur/src/main/resources/standardTestCases/missing_delete.test b/centaur/src/main/resources/standardTestCases/missing_delete.test index d0154ca6b03..d98114539c8 100644 --- a/centaur/src/main/resources/standardTestCases/missing_delete.test +++ b/centaur/src/main/resources/standardTestCases/missing_delete.test @@ -2,7 +2,7 @@ name: missing_delete testFormat: workflowsuccess -backends: [Papiv2] +backends: [GCPBatch, Papiv2] files { workflow: delete_intermediates/missing_delete.wdl diff --git a/centaur/src/main/resources/standardTestCases/monitoring_script_localization_failure.test b/centaur/src/main/resources/standardTestCases/monitoring_script_localization_failure.test index 90d9dd77022..8921ec84fff 100644 --- a/centaur/src/main/resources/standardTestCases/monitoring_script_localization_failure.test +++ b/centaur/src/main/resources/standardTestCases/monitoring_script_localization_failure.test @@ -1,6 +1,6 @@ name: monitoring_script_localization_failure testFormat: workflowfailure -backends: [Papiv2] +backends: [GCPBatch, Papiv2] files { workflow: monitoring_script_localization_failure/monitoring_script_localization_failure.wdl diff --git a/centaur/src/main/resources/standardTestCases/no_output_delete.test b/centaur/src/main/resources/standardTestCases/no_output_delete.test index c85df6be65d..16eda70cfaa 100644 --- a/centaur/src/main/resources/standardTestCases/no_output_delete.test +++ b/centaur/src/main/resources/standardTestCases/no_output_delete.test @@ -2,7 +2,7 @@ name: no_output_delete testFormat: workflowsuccess -backends: [Papiv2] +backends: [GCPBatch, Papiv2] files { workflow: delete_intermediates/no_output_delete.wdl diff --git a/centaur/src/main/resources/standardTestCases/papi_cpu_platform.test b/centaur/src/main/resources/standardTestCases/papi_cpu_platform.test index 7b38c3a25d7..52adadff9b3 100644 --- a/centaur/src/main/resources/standardTestCases/papi_cpu_platform.test +++ b/centaur/src/main/resources/standardTestCases/papi_cpu_platform.test @@ -1,6 +1,6 @@ name: papi_cpu_platform testFormat: workflowsuccess -backends: [Papiv2] +backends: [GCPBatch, Papiv2] files { workflow: papi_cpu_platform/papi_cpu_platform.wdl diff --git a/centaur/src/main/resources/standardTestCases/papi_preemptible_and_max_retries.test b/centaur/src/main/resources/standardTestCases/papi_preemptible_and_max_retries.test index ad055cccee9..5d04cc33ffc 100644 --- a/centaur/src/main/resources/standardTestCases/papi_preemptible_and_max_retries.test +++ b/centaur/src/main/resources/standardTestCases/papi_preemptible_and_max_retries.test @@ -1,6 +1,6 @@ name: papi_preemptible_and_max_retries testFormat: workflowfailure -backends: [Papiv2] +backends: [GCPBatch, Papiv2] files { workflow: papi_preemptible_and_max_retries/papi_preemptible_and_max_retries.wdl diff --git a/centaur/src/main/resources/standardTestCases/papi_v2_log.test b/centaur/src/main/resources/standardTestCases/papi_v2_log.test index cf9b33b2c11..8e693096f35 100644 --- a/centaur/src/main/resources/standardTestCases/papi_v2_log.test +++ b/centaur/src/main/resources/standardTestCases/papi_v2_log.test @@ -1,6 +1,6 @@ name: papi_v2_log testFormat: workflowsuccess -backends: [Papiv2] +backends: [GCPBatch, Papiv2] files { workflow: papi_v2_log/papi_v2_log.wdl diff --git a/centaur/src/main/resources/standardTestCases/restart.restart_jes_with_recover.test b/centaur/src/main/resources/standardTestCases/restart.restart_jes_with_recover.test index 1d8c61e1802..c471d2ba300 100644 --- a/centaur/src/main/resources/standardTestCases/restart.restart_jes_with_recover.test +++ b/centaur/src/main/resources/standardTestCases/restart.restart_jes_with_recover.test @@ -1,7 +1,7 @@ name: restart_jes_with_recover testFormat: CromwellRestartWithRecover callMark: cromwell_restart.cromwell_killer -backends: [Papi] +backends: [GCPBatch, Papi] files { workflow: cromwell_restart/cromwell_restart.wdl diff --git a/centaur/src/main/resources/standardTestCases/retry_with_more_memory.test b/centaur/src/main/resources/standardTestCases/retry_with_more_memory.test index 008fe1b932d..fc570c993f2 100644 --- a/centaur/src/main/resources/standardTestCases/retry_with_more_memory.test +++ b/centaur/src/main/resources/standardTestCases/retry_with_more_memory.test @@ -1,6 +1,6 @@ name: retry_with_more_memory testFormat: workflowfailure -backends: [Papiv2] +backends: [GCPBatch, Papiv2] files { workflow: retry_with_more_memory/retry_with_more_memory.wdl diff --git a/centaur/src/main/resources/standardTestCases/scatter_delete.test b/centaur/src/main/resources/standardTestCases/scatter_delete.test index bead9340070..88ba326b502 100644 --- a/centaur/src/main/resources/standardTestCases/scatter_delete.test +++ b/centaur/src/main/resources/standardTestCases/scatter_delete.test @@ -2,7 +2,7 @@ name: scatter_delete testFormat: workflowsuccess -backends: [Papiv2] +backends: [GCPBatch, Papiv2] files { workflow: delete_intermediates/scatter_delete.wdl diff --git a/centaur/src/main/resources/standardTestCases/stdout_delete.test b/centaur/src/main/resources/standardTestCases/stdout_delete.test index ef7f3a079b0..f0587b82fda 100644 --- a/centaur/src/main/resources/standardTestCases/stdout_delete.test +++ b/centaur/src/main/resources/standardTestCases/stdout_delete.test @@ -2,7 +2,7 @@ name: stdout_delete testFormat: workflowsuccess -backends: [Papiv2] +backends: [GCPBatch, Papiv2] files { workflow: delete_intermediates/stdout_delete.wdl diff --git a/centaur/src/main/resources/standardTestCases/sub_workflow_delete.test b/centaur/src/main/resources/standardTestCases/sub_workflow_delete.test index 18f50daabb7..15d84371dbd 100644 --- a/centaur/src/main/resources/standardTestCases/sub_workflow_delete.test +++ b/centaur/src/main/resources/standardTestCases/sub_workflow_delete.test @@ -2,7 +2,7 @@ name: sub_workflow_delete testFormat: workflowsuccess -backends: [Papiv2] +backends: [GCPBatch, Papiv2] files { workflow: delete_intermediates/sub_workflow_delete.wdl diff --git a/centaur/src/main/resources/standardTestCases/wdl_optional_outputs_unsupported.test b/centaur/src/main/resources/standardTestCases/wdl_optional_outputs_unsupported.test index d5792b85e59..0208af023fc 100644 --- a/centaur/src/main/resources/standardTestCases/wdl_optional_outputs_unsupported.test +++ b/centaur/src/main/resources/standardTestCases/wdl_optional_outputs_unsupported.test @@ -1,6 +1,6 @@ name: wdl_optional_outputs_unsupported testFormat: workflowfailure -backends: [Papiv2] +backends: [GCPBatch, Papiv2] files { workflow: wdl_optional_outputs/wdl_optional_outputs_unsupported.wdl diff --git a/centaur/src/main/resources/standardTestCases/workbench_health_monitor_check_papiv2.test b/centaur/src/main/resources/standardTestCases/workbench_health_monitor_check_papiv2.test index e9f55c9af1a..d84c37c8bc3 100644 --- a/centaur/src/main/resources/standardTestCases/workbench_health_monitor_check_papiv2.test +++ b/centaur/src/main/resources/standardTestCases/workbench_health_monitor_check_papiv2.test @@ -1,6 +1,6 @@ name: workbench_health_monitor_check_papiv2 testFormat: workflowsuccess -backends: [Papiv2] +backends: [GCPBatch, Papiv2] files { workflow: workbench_health_monitor_check/workbench_health_monitor_check.wdl From 8d121e0514417cf8e9d414e5499413873c9a7cb7 Mon Sep 17 00:00:00 2001 From: Adam Nichols Date: Thu, 16 May 2024 11:56:50 -0400 Subject: [PATCH 2/3] Try disabling local backend on GCP Batch --- src/ci/resources/gcp_batch_application.inc.conf.ctmpl | 6 ------ src/ci/resources/gcp_batch_shared_application.inc.conf | 1 + 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/ci/resources/gcp_batch_application.inc.conf.ctmpl b/src/ci/resources/gcp_batch_application.inc.conf.ctmpl index bedffda63df..e0f4641db7a 100644 --- a/src/ci/resources/gcp_batch_application.inc.conf.ctmpl +++ b/src/ci/resources/gcp_batch_application.inc.conf.ctmpl @@ -1,9 +1,3 @@ -backend { - providers { - Local.config.filesystems.gcs.auth = "service_account" - } -} - engine { filesystems { gcs { diff --git a/src/ci/resources/gcp_batch_shared_application.inc.conf b/src/ci/resources/gcp_batch_shared_application.inc.conf index 786a35fd3f7..25e9bd286ed 100644 --- a/src/ci/resources/gcp_batch_shared_application.inc.conf +++ b/src/ci/resources/gcp_batch_shared_application.inc.conf @@ -12,6 +12,7 @@ services { backend { default = "GCPBATCH" + # TODO: dead code alert. We do not read the `enabled` key anywhere. enabled = ["GCPBATCH"] providers { # Default gcp batch backend From 22b3ff02c25f3a9c9ed646f5ce90775e26adfe3b Mon Sep 17 00:00:00 2001 From: Adam Nichols Date: Thu, 16 May 2024 12:11:01 -0400 Subject: [PATCH 3/3] Maybe this? --- src/ci/resources/gcp_batch_shared_application.inc.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/ci/resources/gcp_batch_shared_application.inc.conf b/src/ci/resources/gcp_batch_shared_application.inc.conf index 25e9bd286ed..bcc9bda6ee2 100644 --- a/src/ci/resources/gcp_batch_shared_application.inc.conf +++ b/src/ci/resources/gcp_batch_shared_application.inc.conf @@ -14,6 +14,10 @@ backend { default = "GCPBATCH" # TODO: dead code alert. We do not read the `enabled` key anywhere. enabled = ["GCPBATCH"] + + # Disable Local backend + Local.config.root = "/dev/null" + providers { # Default gcp batch backend GCPBATCH {