Skip to content

Commit

Permalink
Merge pull request #852 from mgcam/runfolder4review_check
Browse files Browse the repository at this point in the history
Review check - runfolder_path arg is added.
  • Loading branch information
jmtcsngr authored Aug 22, 2024
2 parents 09bae09 + 987d359 commit 40f1a99
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
3 changes: 3 additions & 0 deletions Changes
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
LIST OF CHANGES
---------------

- The runfolder_path argument is added to the command for the autoqc review
check. See https://github.com/wtsi-npg/npg_qc/pull/869

release 68.4.0 (2024-08-06)
- Ensured mark duplicate method can be inferred for a product with multiple
studies (tag zero).
Expand Down
4 changes: 2 additions & 2 deletions lib/npg_pipeline/function/autoqc.pm
Original file line number Diff line number Diff line change
Expand Up @@ -271,8 +271,8 @@ sub _generate_command {
$c .= q[ ] . join q[ ], (map {"--qc_in=$_"} (keys %qc_in_roots));
}
elsif($check eq q/review/) {
$c .= q{ --qc_in=} . $qc_out_path;
$c .= q{ --conf_path=} . $self->conf_path;
$c .= sprintf q{ --qc_in=%s --conf_path=%s --runfolder_path=%s},
$qc_out_path, $self->conf_path, $self->runfolder_path;
}
else {
## default input_files [none?]
Expand Down
6 changes: 4 additions & 2 deletions t/20-function-autoqc.t
Original file line number Diff line number Diff line change
Expand Up @@ -615,13 +615,15 @@ subtest 'review' => sub {
my $d = $definitions{'8747:8'};
my $expected_command = q{qc --check=review --rpt_list="8747:8" } .
qq{--filename_root=8747_8 --qc_out=$archive_dir/lane8/qc } .
qq{--qc_in=$archive_dir/lane8/qc --conf_path=t/data/release/config/qc_review};
qq{--qc_in=$archive_dir/lane8/qc --conf_path=t/data/release/config/qc_review } .
qq{--runfolder_path=$rf_path};
is ($d->command, $expected_command, 'correct command for lane-level job');

$d = $definitions{'8747:1:1'};
$expected_command = q{qc --check=review --rpt_list="8747:1:1" } .
qq{--filename_root=8747_1#1 --qc_out=$archive_dir/lane1/plex1/qc } .
qq{--qc_in=$archive_dir/lane1/plex1/qc --conf_path=t/data/release/config/qc_review};
qq{--qc_in=$archive_dir/lane1/plex1/qc --conf_path=t/data/release/config/qc_review } .
qq{--runfolder_path=$rf_path};
is ($d->command, $expected_command, 'correct command for plex-level job');
};

Expand Down

0 comments on commit 40f1a99

Please sign in to comment.