Skip to content

Commit 56f16fc

Browse files
committed
Set path to metadata for each sequencer in config
1 parent 71307a2 commit 56f16fc

2 files changed

Lines changed: 5 additions & 6 deletions

File tree

dataflow_transfer/run_classes/generic_runs.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ def __init__(self, run_dir, configuration):
2525
self.run_dir, ".metadata_rsync_exitcode"
2626
)
2727
self.metadata_destination = os.path.join(
28-
self.configuration.get("metadata_archive"),
29-
getattr(self, "run_type", None),
28+
self.sequencer_config.get("metadata_archive"),
3029
self.run_id,
3130
)
3231
self.final_rsync_exitcode_file = os.path.join(

dataflow_transfer/tests/test_run_classes.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ def novaseqxplus_testobj(tmp_path):
1212
config = {
1313
"log": {"file": "test.log"},
1414
"transfer_details": {"user": "testuser", "host": "testhost"},
15-
"metadata_archive": "/data/metadata_archive",
1615
"statusdb": {
1716
"username": "dbuser",
1817
"password": "dbpass",
@@ -23,6 +22,7 @@ def novaseqxplus_testobj(tmp_path):
2322
"NovaSeqXPlus": {
2423
"remote_destination": "/data/NovaSeqXPlus",
2524
"metadata_for_statusdb": ["RunInfo.xml", "RunParameters.xml"],
25+
"metadata_archive": "/data/metadata_archive/NovaSeqXPlus",
2626
"ignore_folders": ["nosync"],
2727
"remote_rsync_options": ["--chmod=Dg+s,g+rw"],
2828
"metadata_rsync_options": [
@@ -44,7 +44,6 @@ def nextseq_testobj(tmp_path):
4444
config = {
4545
"log": {"file": "test.log"},
4646
"transfer_details": {"user": "testuser", "host": "testhost"},
47-
"metadata_archive": "/data/metadata_archive",
4847
"statusdb": {
4948
"username": "dbuser",
5049
"password": "dbpass",
@@ -55,6 +54,7 @@ def nextseq_testobj(tmp_path):
5554
"NextSeq": {
5655
"remote_destination": "/data/NextSeq",
5756
"metadata_for_statusdb": ["RunInfo.xml", "RunParameters.xml"],
57+
"metadata_archive": "/data/metadata_archive/NextSeq",
5858
"ignore_folders": ["nosync"],
5959
"remote_rsync_options": ["--chmod=Dg+s,g+rw"],
6060
"metadata_rsync_options": [
@@ -76,7 +76,6 @@ def miseqseq_testobj(tmp_path):
7676
config = {
7777
"log": {"file": "test.log"},
7878
"transfer_details": {"user": "testuser", "host": "testhost"},
79-
"metadata_archive": "/data/metadata_archive",
8079
"statusdb": {
8180
"username": "dbuser",
8281
"password": "dbpass",
@@ -87,6 +86,7 @@ def miseqseq_testobj(tmp_path):
8786
"MiSeq": {
8887
"remote_destination": "/data/MiSeq",
8988
"metadata_for_statusdb": ["RunInfo.xml", "RunParameters.xml"],
89+
"metadata_archive": "/data/metadata_archive/MiSeq",
9090
"ignore_folders": ["nosync"],
9191
"remote_rsync_options": ["--chmod=Dg+s,g+rw"],
9292
"metadata_rsync_options": [
@@ -108,7 +108,6 @@ def miseqseqi100_testobj(tmp_path):
108108
config = {
109109
"log": {"file": "test.log"},
110110
"transfer_details": {"user": "testuser", "host": "testhost"},
111-
"metadata_archive": "/data/metadata_archive",
112111
"statusdb": {
113112
"username": "dbuser",
114113
"password": "dbpass",
@@ -119,6 +118,7 @@ def miseqseqi100_testobj(tmp_path):
119118
"MiSeqi100": {
120119
"remote_destination": "/data/MiSeqi100",
121120
"metadata_for_statusdb": ["RunInfo.xml", "RunParameters.xml"],
121+
"metadata_archive": "/data/metadata_archive/MiSeqi100",
122122
"ignore_folders": ["nosync"],
123123
"remote_rsync_options": ["--chmod=Dg+s,g+rw"],
124124
"metadata_rsync_options": [

0 commit comments

Comments
 (0)