Skip to content

Commit

Permalink
Merge pull request #842 from mgcam/archive_samplesheet
Browse files Browse the repository at this point in the history
Archive Illumina samplesheet if present
  • Loading branch information
dkj authored May 23, 2024
2 parents 7fdfcb4 + ccd5074 commit 6b108b5
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
3 changes: 3 additions & 0 deletions Changes
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ LIST OF CHANGES
---------------

- Removing Tidyp dependency from CI
- Added 'SampleSheet.csv' file from the top level of the run folder to
a list of archived run-level Illumina data. This file is only present
in MiSeq run folders.

release 68.2.0
- Added '--process_separately_lanes' to the pipeline to explicitly exclude
Expand Down
8 changes: 7 additions & 1 deletion lib/npg_pipeline/function/run_data_to_irods_archiver.pm
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ override 'create' => sub {
my $job_name_prefix = join q{_}, q{publish_run_data2irods}, $self->id_run();
$self->assign_common_definition_attrs($ref, $job_name_prefix);

# Exclude directories, which might have copies of the top-level files
# that are being archived. SampleSheet.csv is expected to be present
# only for MiSeq runs.

my $command = join q[ ],
$PUBLISH_SCRIPT_NAME,
q{--restart_file}, $self->restart_file_path($job_name_prefix),
Expand All @@ -27,8 +31,10 @@ override 'create' => sub {
q{--source_directory}, $self->runfolder_path(),
q{--include}, q['RunInfo.xml'],
q{--include}, q['[Rr]unParameters.xml'],
q{--include}, q['SampleSheet.csv'],
q{--include}, q[InterOp],
q{--exclude}, q[Analysis],
q{--exclude}, q[Data],
q{--id_run}, $self->id_run,
q{--logconf}, $self->conf_file_path('log4perl_publish_illumina.conf');

Expand Down Expand Up @@ -95,7 +101,7 @@ Marina Gourtovaia
=head1 LICENSE AND COPYRIGHT
Copyright (C) 2019 Genome Research Ltd.
Copyright (C) 2018,2019,2021,2022,2023,2024 Genome Research Ltd.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion t/20-function-run_data_to_irods_archiver.t
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ my $util = t::util->new();

my $tmp_dir = $util->temp_directory();
my $script = q{npg_publish_illumina_run.pl};
my $inexcludes = qr/--include 'RunInfo\.xml' --include '\[Rr\]unParameters\.xml' --include InterOp --exclude Analysis/;
my $inexcludes = qr/--include 'RunInfo\.xml' --include '\[Rr\]unParameters\.xml' --include 'SampleSheet\.csv' --include InterOp --exclude Analysis --exclude Data/;

my $defaults = {
default => {
Expand Down

0 comments on commit 6b108b5

Please sign in to comment.