Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WX-1595 Add more cases to GCPBatch backend #7440

Closed
wants to merge 3 commits into from
Closed

WX-1595 Add more cases to GCPBatch backend #7440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
36d26fe
Add more cases to `GCPBatch` backend
aednichols May 16, 2024
8d121e0
Try disabling local backend on GCP Batch
aednichols May 16, 2024
22b3ff0
Maybe this?
aednichols May 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion centaur/src/main/resources/standardTestCases/abort.restart_abort_jes.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion centaur/src/main/resources/standardTestCases/bucket_name_with_no_trailing_slash.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...ources/standardTestCases/call_cache_hit_prefixes_two_roots_empty_hint_cache_hit_papi.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion centaur/src/main/resources/standardTestCases/collections_delete.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

name: collections_delete
testFormat: workflowsuccess
backends: [Papiv2]
backends: [GCPBatch, Papiv2]

files {
workflow: delete_intermediates/collections_delete.wdl
Expand Down
2 changes: 1 addition & 1 deletion centaur/src/main/resources/standardTestCases/docker_hash_gcr_private.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion centaur/src/main/resources/standardTestCases/draft3_call_cache_capoeira_jes.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion centaur/src/main/resources/standardTestCases/draft3_custom_mount_point.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion centaur/src/main/resources/standardTestCases/error_10_preemptible.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: error_10_preemptible
testFormat: workflowsuccess
backends: [Papiv2]
backends: [GCPBatch, Papiv2]

files {
workflow: error_10_preemptible/error_10_preemptible.wdl
Expand Down
2 changes: 1 addition & 1 deletion centaur/src/main/resources/standardTestCases/final_call_logs_dir_jes.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion centaur/src/main/resources/standardTestCases/gcs_path_ending_with_newline.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion centaur/src/main/resources/standardTestCases/google_labels_bad.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: google_labels_bad
testFormat: workflowfailure
backends: [Papiv2]
backends: [GCPBatch, Papiv2]

files {
workflow: google_labels/google_labels.wdl
Expand Down
2 changes: 1 addition & 1 deletion centaur/src/main/resources/standardTestCases/gpu_cuda_image.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: gpu_cuda_image
testFormat: workflowsuccess
backends: [Papi]
backends: [GCPBatch, Papi]
ignore: true

files {
Expand Down
2 changes: 1 addition & 1 deletion centaur/src/main/resources/standardTestCases/gpu_on_papi_invalid.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion centaur/src/main/resources/standardTestCases/hello_delete.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

name: hello_delete
testFormat: workflowsuccess
backends: [Papiv2]
backends: [GCPBatch, Papiv2]

files {
workflow: delete_intermediates/hello_delete.wdl
Expand Down
2 changes: 1 addition & 1 deletion centaur/src/main/resources/standardTestCases/hello_google_legacy_machine_selection.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: hello_google_legacy_machine_selection
testFormat: workflowsuccess
backends: [ Papiv2 ]
backends: [GCPBatch, Papiv2]

files {
workflow: wdl_draft3/hello/hello.wdl
Expand Down
2 changes: 1 addition & 1 deletion centaur/src/main/resources/standardTestCases/http_inputs.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: http_inputs
backends: [Local, Papiv2]
backends: [GCPBatch, Local, Papiv2]
testFormat: workflowsuccess
skipDescribeEndpointValidation: true

Expand Down
2 changes: 1 addition & 1 deletion centaur/src/main/resources/standardTestCases/input_expressions.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: input_expressions
testFormat: workflowsuccess
backends: [Papi, Local]
backends: [GCPBatch, Papi, Local]

files {
workflow: input_expressions/input_expressions.wdl
Expand Down
2 changes: 1 addition & 1 deletion centaur/src/main/resources/standardTestCases/invalidate_bad_caches_jes.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion centaur/src/main/resources/standardTestCases/jes_labels.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: jes_labels
testFormat: workflowsuccess
tags: [ labels ]
backends: [Papi]
backends: [GCPBatch, Papi]

files {
workflow: labels/jes_labels.wdl
Expand Down
2 changes: 1 addition & 1 deletion centaur/src/main/resources/standardTestCases/local_gcs.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: local_gcs
testFormat: workflowsuccess
backends: [Papi, Local]
backends: [GCPBatch, Papi, Local]

files {
workflow: local_gcs/local_gcs.wdl
Expand Down
2 changes: 1 addition & 1 deletion centaur/src/main/resources/standardTestCases/lots_of_inputs_papiv2.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion centaur/src/main/resources/standardTestCases/missing_delete.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

name: missing_delete
testFormat: workflowsuccess
backends: [Papiv2]
backends: [GCPBatch, Papiv2]

files {
workflow: delete_intermediates/missing_delete.wdl
Expand Down
2 changes: 1 addition & 1 deletion centaur/src/main/resources/standardTestCases/monitoring_script_localization_failure.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion centaur/src/main/resources/standardTestCases/no_output_delete.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

name: no_output_delete
testFormat: workflowsuccess
backends: [Papiv2]
backends: [GCPBatch, Papiv2]

files {
workflow: delete_intermediates/no_output_delete.wdl
Expand Down
2 changes: 1 addition & 1 deletion centaur/src/main/resources/standardTestCases/papi_cpu_platform.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: papi_cpu_platform
testFormat: workflowsuccess
backends: [Papiv2]
backends: [GCPBatch, Papiv2]

files {
workflow: papi_cpu_platform/papi_cpu_platform.wdl
Expand Down
2 changes: 1 addition & 1 deletion centaur/src/main/resources/standardTestCases/papi_preemptible_and_max_retries.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion centaur/src/main/resources/standardTestCases/papi_v2_log.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: papi_v2_log
testFormat: workflowsuccess
backends: [Papiv2]
backends: [GCPBatch, Papiv2]

files {
workflow: papi_v2_log/papi_v2_log.wdl
Expand Down
2 changes: 1 addition & 1 deletion centaur/src/main/resources/standardTestCases/restart.restart_jes_with_recover.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion centaur/src/main/resources/standardTestCases/retry_with_more_memory.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion centaur/src/main/resources/standardTestCases/scatter_delete.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

name: scatter_delete
testFormat: workflowsuccess
backends: [Papiv2]
backends: [GCPBatch, Papiv2]

files {
workflow: delete_intermediates/scatter_delete.wdl
Expand Down
2 changes: 1 addition & 1 deletion centaur/src/main/resources/standardTestCases/stdout_delete.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

name: stdout_delete
testFormat: workflowsuccess
backends: [Papiv2]
backends: [GCPBatch, Papiv2]

files {
workflow: delete_intermediates/stdout_delete.wdl
Expand Down
2 changes: 1 addition & 1 deletion centaur/src/main/resources/standardTestCases/sub_workflow_delete.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

name: sub_workflow_delete
testFormat: workflowsuccess
backends: [Papiv2]
backends: [GCPBatch, Papiv2]

files {
workflow: delete_intermediates/sub_workflow_delete.wdl
Expand Down
2 changes: 1 addition & 1 deletion centaur/src/main/resources/standardTestCases/wdl_optional_outputs_unsupported.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion centaur/src/main/resources/standardTestCases/workbench_health_monitor_check_papiv2.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 0 additions & 6 deletions src/ci/resources/gcp_batch_application.inc.conf.ctmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
backend {
providers {
Local.config.filesystems.gcs.auth = "service_account"
}
}

engine {
filesystems {
gcs {
Expand Down
5 changes: 5 additions & 0 deletions src/ci/resources/gcp_batch_shared_application.inc.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,12 @@ services {

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 {
Expand Down
Loading