Skip to content

Commit 8988d9a

Browse files
np hca adapter test (#372)
* add test for hca adapter * fix test inputs json and add http imports for testing * switch inputs * update cromwell url * change to relative imports * update test inputs to dev/null * update test inputs * change to http imports for terra testing * update ValidateHcaAdapter.wdl for testing * update ValidateHcaAdapter.wdl for testing * update ValidateHcaAdapter.wdl for testing * update ValidateHcaAdapter.wdl for testing * fix task * revert everything * testing * zcat to cat * update ValidateOptimusDescriptorAnalysisFiles * testing * testing * revert everything again * testing * testing * testing * update ValidateOptimusDescriptorAnalysisFiles * update ValidateOptimusDescriptorAnalysisFiles * update ValidateOptimusDescriptorAnalysisFiles * update ValidateOptimusDescriptorAnalysisFiles * update ValidateOptimusDescriptorAnalysisFiles * update ValidateOptimusLinksFiles * update ValidateOptimusLinksFiles * adding more tasks * fix hashes * fix hashes * try diff for links json * try diff for links json * try diff for links json * testing * testing * remove optimus * fix inputs * fix hashes * fix hashes * change all tasks to use diff * switch indices * switch indices * testing * testing * more testing * more testing * adding in ss2 truth inputs and calls/tasks * fix ss2_metadata_analysis_file_intermediate_bai_json_truth * adding in more ss2 related tasks, adding in more outputs to getTerraMetadata.wdl * fix typo * change to http import so terra understands * rename input to OptimusPostProcessing.wdl * rename library input to OptimusPostProcessing.wdl * rename library input to OptimusPostProcessing.wdl * undo * undo * testing * add validation for optimus post processing * undo some validation * add links validation * add ValidateOptimusMetadataProjectLevelAnalysisFiles validation * add ValidateOptimusMetadataProjectLevelAnalysisProcess validation * add ValidateOptimusMetadataProjectLevelAnalysisProtocol validation * clean up ss2 from optimus_test_hca_adapter_PR.wdl * clean up some text in ValidateHcaAdapter.wdl * update optimus imports back to relative * updating test wdl to match whats in terra * remove test inputs json * collapse all tasks into one task * type * another weird type * collapsing tasks into 1, moving get terra metadata wdl * fix import * change to relative imports, add test wdl to dockstore * whiteespace Co-authored-by: jessicaway <jway@broadinstitute.org>
1 parent 70e3e8f commit 8988d9a

5 files changed

Lines changed: 1167 additions & 7 deletions

File tree

.dockstore.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,8 @@ workflows:
4747

4848
- name: CEMBA
4949
subclass: WDL
50-
primaryDescriptorPath: /pipelines/cemba/cemba_methylcseq/CEMBA.wdl
50+
primaryDescriptorPath: /pipelines/cemba/cemba_methylcseq/CEMBA.wdl
51+
52+
- name: OptimusTestHcaAdapter
53+
subclass: WDL
54+
primaryDescriptorPath: /tests/skylab/hca_adapter/pr/optimus_test_hca_adapter_PR.wdl

projects/hca_mvp/OptimusPostProcessing.wdl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,36 +12,36 @@ workflow OptimusPostProcessing {
1212
Array[File] library_looms
1313
Array[File] analysis_file_jsons
1414
Array[File] links_jsons
15-
Array[String] library
15+
Array[String] post_processing_library
1616
Array[String] species
1717
Array[String] organ
1818
String project_id
1919
String project_name
2020
String output_basename
21-
String staging_area = "gs://broad-dsp-monster-hca-prod-lantern/"
21+
String post_processing_staging_area = "gs://broad-dsp-monster-hca-prod-lantern/"
2222
String version_timestamp = "2021-05-24T12:00:00.000000Z"
2323
}
2424

2525

2626
# version of this pipeline
2727
String pipeline_version = "1.0.0"
2828

29-
String project_stratum_string = "project=" + project_id + ";library=" + library[0] + ";species=" + species[0] + ";organ=" + organ[0]
29+
String project_stratum_string = "project=" + project_id + ";library=" + post_processing_library[0] + ";species=" + species[0] + ";organ=" + organ[0]
3030

3131
# Build staging bucket
32-
String staging_bucket = staging_area + project_id + "/staging/"
32+
String staging_bucket = post_processing_staging_area + project_id + "/staging/"
3333

3434
call PostProcessing.CheckMetadata {
3535
input:
36-
library = library,
36+
library = post_processing_library,
3737
species = species,
3838
organ = organ
3939
}
4040
4141
call PostProcessing.MergeLooms {
4242
input:
4343
library_looms = library_looms,
44-
library = library[0],
44+
library = post_processing_library[0],
4545
species = species[0],
4646
organ = organ[0],
4747
project_id = project_id,

0 commit comments

Comments
 (0)