-
Notifications
You must be signed in to change notification settings - Fork 358
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.
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
Reference disks in GCP Batch [WX-1819] #7502
Merged
Merged
Changes from 2 commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
4f2a8cd
Demo of broken reference disks in GCP Batch [WX-1819]
mcovarr 922ee93
Merge branch 'develop' into wx_1819_reference_disks_in_batch
mcovarr ecec713
Fix bug where reference disk mount was set with async and rw options.…
dspeck1 036e7ee
Merge branch 'develop' into wx_1819_reference_disks_in_batch
mcovarr 4094b37
Update mount path to path supported by Google Cloud Batch.
dspeck1 343de85
Merge branch 'develop' into wx_1819_reference_disks_in_batch
mcovarr 7587b53
update Centaur tests to exercise reference disks on Batch
mcovarr 44c5178
cleanup
mcovarr 0048be4
fix test
mcovarr 9464b9f
only mount reference disks if asked to
mcovarr 788355a
fix GCP Batch version of reference disk negative test
mcovarr e66311b
fixup PAPI v2 version
mcovarr b8a34cb
Merge remote-tracking branch 'origin/develop' into wx_1819_reference_…
mcovarr bfa1f67
changelog
mcovarr a2b6352
Merge branch 'develop' into wx_1819_reference_disks_in_batch
mcovarr File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
17 changes: 17 additions & 0 deletions
17
centaur/src/main/resources/standardTestCases/gcpbatch_reference_disk_true_options.test
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
name: gcpbatch_reference_disk_test_true_option | ||
testFormat: workflowsuccess | ||
backends: [GCPBATCH-Reference-Disk-Localization] | ||
|
||
files { | ||
workflow: reference_disk/gcpbatch/reference_disk_test.wdl | ||
inputs: reference_disk/reference_disk_test.inputs | ||
options: reference_disk/reference_disk_test_true.options.json | ||
} | ||
|
||
metadata { | ||
workflowName: wf_reference_disk_test | ||
status: Succeeded | ||
"outputs.wf_reference_disk_test.is_broad_input_file_a_valid_symlink": true | ||
"outputs.wf_reference_disk_test.is_nirvana_input_file_a_valid_symlink": true | ||
"outputs.wf_reference_disk_test.is_nirvana_metachar_input_file_a_valid_symlink": true | ||
} |
60 changes: 60 additions & 0 deletions
60
centaur/src/main/resources/standardTestCases/reference_disk/gcpbatch/reference_disk_test.wdl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
version 1.0 | ||
|
||
task check_if_localized_with_valid_symlink { | ||
input { | ||
File broad_reference_file_input | ||
File nirvana_reference_file_input | ||
File nirvana_reference_file_metachar_input | ||
} | ||
String broad_input_valid_symlink = "broad_input_valid_symlink.txt" | ||
String nirvana_input_valid_symlink = "nirvana_input_valid_symlink.txt" | ||
String nirvana_metachar_input_valid_symlink = "nirvana_metachar_input_valid_symlink.txt" | ||
command <<< | ||
PS4='\D{+%F %T} \w $ ' | ||
set -o nounset -o pipefail -o xtrace | ||
|
||
# Echo true to stdout if the argument is a symlink pointing to an extant file, otherwise echo false. | ||
check_if_valid_symlink() { | ||
local reference_input="$1" | ||
|
||
if [[ -h "${reference_input}" && -f $(readlink "${reference_input}") ]]; then | ||
echo true | ||
else | ||
echo false | ||
fi | ||
} | ||
|
||
check_if_valid_symlink "~{broad_reference_file_input}" > ~{broad_input_valid_symlink} | ||
check_if_valid_symlink "~{nirvana_reference_file_input}" > ~{nirvana_input_valid_symlink} | ||
check_if_valid_symlink "~{nirvana_reference_file_metachar_input}" > ~{nirvana_metachar_input_valid_symlink} | ||
|
||
>>> | ||
output { | ||
Boolean is_broad_input_valid_symlink = read_boolean("~{broad_input_valid_symlink}") | ||
Boolean is_nirvana_input_valid_symlink = read_boolean("~{nirvana_input_valid_symlink}") | ||
Boolean is_nirvana_metachar_input_valid_symlink = read_boolean("~{nirvana_metachar_input_valid_symlink}") | ||
} | ||
runtime { | ||
docker: "ubuntu:latest" | ||
backend: "GCPBATCH-Reference-Disk-Localization" | ||
} | ||
} | ||
|
||
workflow wf_reference_disk_test { | ||
input { | ||
File broad_reference_file_input | ||
File nirvana_reference_file_input | ||
File nirvana_reference_file_metachar_input | ||
} | ||
call check_if_localized_with_valid_symlink { | ||
input: | ||
broad_reference_file_input = broad_reference_file_input, | ||
nirvana_reference_file_input = nirvana_reference_file_input, | ||
nirvana_reference_file_metachar_input = nirvana_reference_file_metachar_input | ||
} | ||
output { | ||
Boolean is_broad_input_file_a_valid_symlink = check_if_localized_with_valid_symlink.is_broad_input_valid_symlink | ||
Boolean is_nirvana_input_file_a_valid_symlink = check_if_localized_with_valid_symlink.is_nirvana_input_valid_symlink | ||
Boolean is_nirvana_metachar_input_file_a_valid_symlink = check_if_localized_with_valid_symlink.is_nirvana_metachar_input_valid_symlink | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we'll want to rename this manifest file once we have things working