diff --git a/Changes b/Changes index 2cb9ed79..57135db8 100644 --- a/Changes +++ b/Changes @@ -1,6 +1,8 @@ LIST OF CHANGES --------------- - + + - Added new functions, lane_archival_in_progress and lane_lane_released, + to the run archival function graph. - Changed pipeline daemons so that they pick up runs performed on the instruments by a manufacturer with a name given by a new attribute - instrument_name. By default this name is set to 'Illumina' so that diff --git a/data/config_files/function_list_post_qc_review.json b/data/config_files/function_list_post_qc_review.json index 6bd3e415..1333de37 100644 --- a/data/config_files/function_list_post_qc_review.json +++ b/data/config_files/function_list_post_qc_review.json @@ -4,8 +4,13 @@ { "relation": "dependsOn", "source": "pipeline_start", - "target": "run_archival_in_progress" + "target": "lane_archival_in_progress" }, + { + "relation": "dependsOn", + "source": "lane_archival_in_progress", + "target": "run_archival_in_progress" + }, { "relation": "dependsOn", "source": "run_archival_in_progress", @@ -39,6 +44,11 @@ { "relation": "dependsOn", "source": "archive_irods_locations_to_ml_warehouse", + "target": "lane_lane_released" + }, + { + "relation": "dependsOn", + "source": "lane_lane_released", "target": "run_run_archived" }, { @@ -86,6 +96,32 @@ } } }, + { + "id": "lane_archival_in_progress", + "label": "lane_archival_in_progress", + "metadata": { + "description": "Writes a serialized representation of the 'archival in progress' lane status to the file system", + "resources": { + "default": { + "queue": "small", + "minimum_cpu": 0 + } + } + } + }, + { + "id": "lane_lane_released", + "label": "lane_lane_released", + "metadata": { + "description": "Writes a serialized representation of the 'lane released' lane status to the file system", + "resources": { + "default": { + "queue": "small", + "minimum_cpu": 0 + } + } + } + }, { "id": "run_archival_in_progress", "label": "run_archival_in_progress", diff --git a/lib/npg_pipeline/pluggable/registry.pm b/lib/npg_pipeline/pluggable/registry.pm index f22ecf99..6d91db8f 100644 --- a/lib/npg_pipeline/pluggable/registry.pm +++ b/lib/npg_pipeline/pluggable/registry.pm @@ -76,7 +76,9 @@ Readonly::Array my @SAVE2FILE_STATUS_FUNCTIONS => run_analysis_complete run_secondary_analysis_in_progress run_qc_review_pending + lane_archival_in_progress run_archival_in_progress + lane_lane_released run_run_archived run_qc_complete lane_analysis_in_progress diff --git a/t/data/dbic_fixtures/000-RunLaneStatusDict.yml b/t/data/dbic_fixtures/000-RunLaneStatusDict.yml index 069ee514..6e366295 100644 --- a/t/data/dbic_fixtures/000-RunLaneStatusDict.yml +++ b/t/data/dbic_fixtures/000-RunLaneStatusDict.yml @@ -5,3 +5,7 @@ id_run_lane_status_dict: 2 - description: manual qc complete id_run_lane_status_dict: 3 +- description: archival in progress + id_run_lane_status_dict: 4 +- description: lane released + id_run_lane_status_dict: 5