diff --git a/tests/manual/tests_via_nomad/asapo-test_filegen_filemon.nomad.in b/tests/manual/tests_via_nomad/asapo-test_filegen_worker.nomad.in
similarity index 100%
rename from tests/manual/tests_via_nomad/asapo-test_filegen_filemon.nomad.in
rename to tests/manual/tests_via_nomad/asapo-test_filegen_worker.nomad.in
diff --git a/tests/manual/tests_via_nomad/asapo-test_filegen_filemon_1M.nomad.in b/tests/manual/tests_via_nomad/asapo-test_filegen_worker_1M.nomad.in
similarity index 100%
rename from tests/manual/tests_via_nomad/asapo-test_filegen_filemon_1M.nomad.in
rename to tests/manual/tests_via_nomad/asapo-test_filegen_worker_1M.nomad.in
diff --git a/tests/manual/tests_via_nomad/asapo-test_filegen_worker_1M_batch.nomad.in b/tests/manual/tests_via_nomad/asapo-test_filegen_worker_1M_batch.nomad.in
new file mode 100644
index 0000000000000000000000000000000000000000..2ce7d38242e70bd5ce9ba73f651ca04edbe339ce
--- /dev/null
+++ b/tests/manual/tests_via_nomad/asapo-test_filegen_worker_1M_batch.nomad.in
@@ -0,0 +1,199 @@
+job "asapo-test" {
+ datacenters = [
+ "dc1"]
+
+ type = "batch"
+
+ group "filegen-windows" {
+
+ constraint {
+ attribute = "${attr.kernel.name}"
+ value = "windows"
+ }
+
+ count = 1
+
+ task "filegen" {
+ driver = "raw_exec"
+
+ config {
+ command = "local/filegen_win.exe"
+ args = [
+ "1",
+ "1M",
+ "100000",
+ "1100",
+ "u:/asapo/test_folder/file_win"]
+ }
+
+ artifact {
+ source = "http://nims.desy.de/extra/asapo/filegen_win.exe"
+ mode = "file"
+ destination = "local/filegen_win.exe"
+ }
+ }
+
+
+ }
+ #windows
+
+ group "filegen-linux" {
+
+ constraint {
+ attribute = "${attr.kernel.name}"
+ value = "linux"
+ }
+
+ constraint {
+ attribute = "${meta.location}"
+ value = "petra3"
+ }
+
+ count = 1
+
+ task "filegen" {
+ driver = "raw_exec"
+
+ config {
+ command = "local/filegen_linux"
+ args = [
+ "1",
+ "1M",
+ "100000",
+ "1200",
+ "/run/user/data/file_lin"]
+ }
+
+ artifact {
+ source = "http://nims.desy.de/extra/asapo/filegen_linux"
+ mode = "file"
+ destination = "local/filegen_linux"
+ }
+ }
+
+ }
+
+
+ group "worker-linux1" {
+
+ restart {
+ attempts = 0
+ }
+
+
+ constraint {
+ attribute = "${attr.kernel.name}"
+ value = "linux"
+ }
+
+ # constraint {
+ # attribute = "${meta.location}"
+ # operator = "!="
+ # value = "petra3"
+ # }
+
+ count = 1
+
+ task "worker-linux" {
+ driver = "raw_exec"
+ template {
+ data = <<EOH
+ WORKER_READ_META_ONLY = "{{ keyOrDefault "worker_read_meta_only" "1" }}"
+ EOH
+ destination = "secrets/file.env"
+ env = true
+ }
+
+ config {
+ command = "local/getnext_broker"
+ args = [
+ "psana002:8400",
+ "/bldocuments/support/asapo/data/test1/asapo_test1",
+ "asapo_test1",
+ "16",
+ "oTsKsj8i6WcW_gVzeIFvZCtSfMErjDELJEyAI23n7Ik=",
+ "30000",
+ "${WORKER_READ_META_ONLY}",
+ "1"]
+ }
+
+# resources {
+# cpu = 5000
+# memory = 128
+# network {
+# mbits = 10000
+# }
+# }
+
+ artifact {
+ source = "http://nims.desy.de/extra/asapo/getnext_broker-@ASAPO_VERSION@"
+ mode = "file"
+ destination = "local/getnext_broker"
+ }
+ }
+
+ }
+ # worker-linux1
+
+
+ group "worker-linux2" {
+
+ restart {
+ attempts = 0
+ }
+
+
+ constraint {
+ attribute = "${attr.kernel.name}"
+ value = "linux"
+ }
+
+ # constraint {
+ # attribute = "${meta.location}"
+ # operator = "!="
+ # value = "petra3"
+ # }
+
+ count = 1
+
+ task "worker-linux" {
+ driver = "raw_exec"
+ template {
+ data = <<EOH
+ WORKER_READ_META_ONLY = "{{ keyOrDefault "worker_read_meta_only" "1" }}"
+ EOH
+ destination = "secrets/file.env"
+ env = true
+ }
+
+ config {
+ command = "local/getnext_broker"
+ args = [
+ "psana002:8400",
+ "/bldocuments/support/asapo/data/test2/asapo_test2",
+ "asapo_test2",
+ "16",
+ "yzgAcLmijSLWIm8dBiGNCbc0i42u5HSm-zR6FRqo__Y=",
+ "30000",
+ "${WORKER_READ_META_ONLY}",
+ "1"]
+ }
+# resources {
+# cpu = 5000
+# memory = 128
+# network {
+# mbits = 10000
+# }
+# }
+
+ artifact {
+ source = "http://nims.desy.de/extra/asapo/getnext_broker-@ASAPO_VERSION@"
+ mode = "file"
+ destination = "local/getnext_broker"
+ }
+ }
+
+ }
+ # worker-linux2
+
+}
diff --git a/tests/manual/tests_via_nomad/asapo-test_filegen_worker_1M_multisource.nomad.in b/tests/manual/tests_via_nomad/asapo-test_filegen_worker_1M_multisource.nomad.in
new file mode 100644
index 0000000000000000000000000000000000000000..26623e83bf7473b7e0292ef3b68b8c5d2f716e38
--- /dev/null
+++ b/tests/manual/tests_via_nomad/asapo-test_filegen_worker_1M_multisource.nomad.in
@@ -0,0 +1,138 @@
+job "asapo-test" {
+ datacenters = [
+ "dc1"]
+
+ type = "batch"
+
+ group "filegen-windows" {
+
+ constraint {
+ attribute = "${attr.kernel.name}"
+ value = "windows"
+ }
+
+ count = 1
+
+ task "filegen" {
+ driver = "raw_exec"
+
+ config {
+ command = "local/filegen_win.exe"
+ args = [
+ "1",
+ "1M",
+ "100000",
+ "1100",
+ "u:/asapo/test_folder/file_win"]
+ }
+
+ artifact {
+ source = "http://nims.desy.de/extra/asapo/filegen_win.exe"
+ mode = "file"
+ destination = "local/filegen_win.exe"
+ }
+ }
+
+
+ }
+ #windows
+
+ group "filegen-linux" {
+
+ constraint {
+ attribute = "${attr.kernel.name}"
+ value = "linux"
+ }
+
+ constraint {
+ attribute = "${meta.location}"
+ value = "petra3"
+ }
+
+ count = 1
+
+ task "filegen" {
+ driver = "raw_exec"
+
+ config {
+ command = "local/filegen_linux"
+ args = [
+ "1",
+ "1M",
+ "100000",
+ "1200",
+ "/run/user/data/file_lin"]
+ }
+
+ artifact {
+ source = "http://nims.desy.de/extra/asapo/filegen_linux"
+ mode = "file"
+ destination = "local/filegen_linux"
+ }
+ }
+
+ }
+
+
+ group "worker" {
+
+ restart {
+ attempts = 0
+ }
+
+
+ constraint {
+ attribute = "${attr.kernel.name}"
+ value = "linux"
+ }
+
+ # constraint {
+ # attribute = "${meta.location}"
+ # operator = "!="
+ # value = "petra3"
+ # }
+
+ count = 1
+
+ task "worker-linux" {
+ driver = "raw_exec"
+ template {
+ data = <<EOH
+ WORKER_READ_META_ONLY = "{{ keyOrDefault "worker_read_meta_only" "1" }}"
+ EOH
+ destination = "secrets/file.env"
+ env = true
+ }
+
+ config {
+ command = "local/getnext_broker"
+ args = [
+ "psana002:8400",
+ "/bldocuments/support/asapo/data/test1/asapo_test1",
+ "asapo_test",
+ "16",
+ "KmUDdacgBzaOD3NIJvN1NmKGqWKtx0DK-NyPjdpeWkc=",
+ "30000",
+ "${WORKER_READ_META_ONLY}",
+ "1"]
+ }
+
+# resources {
+# cpu = 5000
+# memory = 128
+# network {
+# mbits = 10000
+# }
+# }
+
+ artifact {
+ source = "http://nims.desy.de/extra/asapo/getnext_broker-@ASAPO_VERSION@"
+ mode = "file"
+ destination = "local/getnext_broker"
+ }
+ }
+
+ }
+ # worker
+
+}
diff --git a/tests/manual/tests_via_nomad/asapo-test_filegen_worker_batch.nomad.in b/tests/manual/tests_via_nomad/asapo-test_filegen_worker_batch.nomad.in
new file mode 100644
index 0000000000000000000000000000000000000000..1298b228b1cfe5713c7c68f73f782cb76ec277b0
--- /dev/null
+++ b/tests/manual/tests_via_nomad/asapo-test_filegen_worker_batch.nomad.in
@@ -0,0 +1,199 @@
+job "asapo-test" {
+ datacenters = [
+ "dc1"]
+
+ type = "batch"
+
+ group "filegen-windows" {
+
+ constraint {
+ attribute = "${attr.kernel.name}"
+ value = "windows"
+ }
+
+ count = 1
+
+ task "filegen" {
+ driver = "raw_exec"
+
+ config {
+ command = "local/filegen_win.exe"
+ args = [
+ "1",
+ "10M",
+ "10000",
+ "120",
+ "u:/asapo/test_folder/file_win"]
+ }
+
+ artifact {
+ source = "http://nims.desy.de/extra/asapo/filegen_win.exe"
+ mode = "file"
+ destination = "local/filegen_win.exe"
+ }
+ }
+
+
+ }
+ #windows
+
+ group "filegen-linux" {
+
+ constraint {
+ attribute = "${attr.kernel.name}"
+ value = "linux"
+ }
+
+ constraint {
+ attribute = "${meta.location}"
+ value = "petra3"
+ }
+
+ count = 1
+
+ task "filegen" {
+ driver = "raw_exec"
+
+ config {
+ command = "local/filegen_linux"
+ args = [
+ "1",
+ "10M",
+ "10000",
+ "120",
+ "/run/user/data/file_lin"]
+ }
+
+ artifact {
+ source = "http://nims.desy.de/extra/asapo/filegen_linux"
+ mode = "file"
+ destination = "local/filegen_linux"
+ }
+ }
+
+ }
+
+
+ group "worker-linux1" {
+
+ restart {
+ attempts = 0
+ }
+
+
+ constraint {
+ attribute = "${attr.kernel.name}"
+ value = "linux"
+ }
+
+ # constraint {
+ # attribute = "${meta.location}"
+ # operator = "!="
+ # value = "petra3"
+ # }
+
+ count = 1
+
+ task "worker-linux" {
+ driver = "raw_exec"
+ template {
+ data = <<EOH
+ WORKER_READ_META_ONLY = "{{ keyOrDefault "worker_read_meta_only" "1" }}"
+ EOH
+ destination = "secrets/file.env"
+ env = true
+ }
+
+ config {
+ command = "local/getnext_broker"
+ args = [
+ "psana002:8400",
+ "/bldocuments/support/asapo/data/test1/asapo_test1",
+ "asapo_test1",
+ "16",
+ "oTsKsj8i6WcW_gVzeIFvZCtSfMErjDELJEyAI23n7Ik=",
+ "30000",
+ "${WORKER_READ_META_ONLY}",
+ "1"]
+ }
+
+# resources {
+# cpu = 5000
+# memory = 128
+# network {
+# mbits = 10000
+# }
+# }
+
+ artifact {
+ source = "http://nims.desy.de/extra/asapo/getnext_broker-@ASAPO_VERSION@"
+ mode = "file"
+ destination = "local/getnext_broker"
+ }
+ }
+
+ }
+ # worker-linux1
+
+
+ group "worker-linux2" {
+
+ restart {
+ attempts = 0
+ }
+
+
+ constraint {
+ attribute = "${attr.kernel.name}"
+ value = "linux"
+ }
+
+ # constraint {
+ # attribute = "${meta.location}"
+ # operator = "!="
+ # value = "petra3"
+ # }
+
+ count = 1
+
+ task "worker-linux" {
+ driver = "raw_exec"
+ template {
+ data = <<EOH
+ WORKER_READ_META_ONLY = "{{ keyOrDefault "worker_read_meta_only" "1" }}"
+ EOH
+ destination = "secrets/file.env"
+ env = true
+ }
+
+ config {
+ command = "local/getnext_broker"
+ args = [
+ "psana002:8400",
+ "/bldocuments/support/asapo/data/test2/asapo_test2",
+ "asapo_test2",
+ "16",
+ "yzgAcLmijSLWIm8dBiGNCbc0i42u5HSm-zR6FRqo__Y=",
+ "30000",
+ "${WORKER_READ_META_ONLY}",
+ "1"]
+ }
+# resources {
+# cpu = 5000
+# memory = 128
+# network {
+# mbits = 10000
+# }
+# }
+
+ artifact {
+ source = "http://nims.desy.de/extra/asapo/getnext_broker-@ASAPO_VERSION@"
+ mode = "file"
+ destination = "local/getnext_broker"
+ }
+ }
+
+ }
+ # worker-linux2
+
+}
diff --git a/tests/manual/tests_via_nomad/asapo-test_filemon.nomad.in b/tests/manual/tests_via_nomad/asapo-test_filemon.nomad.in
index 5e69201b58fc42f63d9d39900c26a6487fbb3848..250a268036d383197c72106e42ca991914c4b781 100644
--- a/tests/manual/tests_via_nomad/asapo-test_filemon.nomad.in
+++ b/tests/manual/tests_via_nomad/asapo-test_filemon.nomad.in
@@ -35,7 +35,7 @@ job "asapo-filemon" {
"BeamtimeID":"asapo_test1",
"Mode":"tcp",
"NThreads":8,
- "LogLevel":"debug",
+ "LogLevel":"info",
"RootMonitoredFolder":"u:\\asapo",
"MonitoredSubFolders":["test_folder"],
"IgnoreExtentions":["tmp"],
@@ -94,7 +94,7 @@ job "asapo-filemon" {
"BeamtimeID":"asapo_test2",
"Mode":"tcp",
"NThreads":8,
- "LogLevel":"debug",
+ "LogLevel":"info",
"RootMonitoredFolder":"/run/user",
"MonitoredSubFolders":["data"],
"IgnoreExtentions":["tmp"],
diff --git a/tests/manual/tests_via_nomad/asapo-test_filemon_batch.nomad.in b/tests/manual/tests_via_nomad/asapo-test_filemon_batch.nomad.in
index 37df9e4d8a9a74a4b4fe8d6a7f4c891d91198d4d..85e5872e9029e5ff696225e11f520b9781ebc6af 100644
--- a/tests/manual/tests_via_nomad/asapo-test_filemon_batch.nomad.in
+++ b/tests/manual/tests_via_nomad/asapo-test_filemon_batch.nomad.in
@@ -1,4 +1,4 @@
-job "asapo-filemon" {
+job "asapo-filemon_batch" {
datacenters = [
"dc1"]
@@ -35,7 +35,7 @@ job "asapo-filemon" {
"BeamtimeID":"asapo_test1",
"Mode":"tcp",
"NThreads":8,
- "LogLevel":"debug",
+ "LogLevel":"info",
"RootMonitoredFolder":"u:\\asapo",
"MonitoredSubFolders":["test_folder"],
"IgnoreExtentions":["tmp"],
@@ -95,7 +95,7 @@ job "asapo-filemon" {
"BeamtimeID":"asapo_test2",
"Mode":"tcp",
"NThreads":8,
- "LogLevel":"debug",
+ "LogLevel":"info",
"RootMonitoredFolder":"/run/user",
"MonitoredSubFolders":["data"],
"IgnoreExtentions":["tmp"],
diff --git a/tests/manual/tests_via_nomad/asapo-test_filemon_multisource.nomad.in b/tests/manual/tests_via_nomad/asapo-test_filemon_multisource.nomad.in
new file mode 100644
index 0000000000000000000000000000000000000000..2a6159367306c3d349492fd3d740dbdadc7d89b0
--- /dev/null
+++ b/tests/manual/tests_via_nomad/asapo-test_filemon_multisource.nomad.in
@@ -0,0 +1,129 @@
+job "asapo-filemon_multisource" {
+ datacenters = [
+ "dc1"]
+
+ type = "batch"
+
+ group "producer-windows" {
+
+ constraint {
+ attribute = "${attr.kernel.name}"
+ value = "windows"
+ }
+
+ count = 1
+ task "producer" {
+ driver = "raw_exec"
+
+ config {
+ command = "local/asapo-eventmon-producer.exe"
+ args = [
+ "local/test.json"]
+ }
+
+ artifact {
+ source = "http://nims.desy.de/extra/asapo/asapo-eventmon-producer-@ASAPO_VERSION@.exe"
+ mode = "file"
+ destination = "local/asapo-eventmon-producer.exe"
+ }
+
+ template {
+ data = <<EOH
+{
+ "AsapoEndpoint":"psana002:8400",
+ "Tag":"test_tag",
+ "BeamtimeID":"asapo_test",
+ "Mode":"tcp",
+ "NThreads":8,
+ "LogLevel":"info",
+ "RootMonitoredFolder":"u:\\asapo",
+ "MonitoredSubFolders":["test_folder"],
+ "IgnoreExtentions":["tmp"],
+ "RemoveAfterSend":true,
+ "Subset": {
+ "Mode":"multisource",
+ "SourceId": 1,
+ "NSources":2
+ }
+}
+ EOH
+ destination = "local/test.json"
+ }
+ # resources {
+ # cpu = 5000
+ # memory = 128
+ # network {
+ # mbits = 10000
+ # }
+ } # producer task
+ }
+ #windows
+
+ group "producer-linux" {
+
+ constraint {
+ attribute = "${attr.kernel.name}"
+ value = "linux"
+ }
+
+ constraint {
+ attribute = "${meta.location}"
+ value = "petra3"
+ }
+
+ count = 1
+
+ task "producer" {
+ driver = "raw_exec"
+
+ config {
+ command = "local/asapo-eventmon-producer"
+ args = [
+ "local/test.json"]
+ }
+
+ artifact {
+ source = "http://nims.desy.de/extra/asapo/asapo-eventmon-producer-@ASAPO_VERSION@"
+ mode = "file"
+ destination = "local/asapo-eventmon-producer"
+ }
+
+ template {
+ data = <<EOH
+{
+ "AsapoEndpoint":"psana002:8400",
+ "Tag":"test_tag",
+ "BeamtimeID":"asapo_test",
+ "Mode":"tcp",
+ "NThreads":8,
+ "LogLevel":"info",
+ "RootMonitoredFolder":"/run/user",
+ "MonitoredSubFolders":["data"],
+ "IgnoreExtentions":["tmp"],
+ "RemoveAfterSend":true,
+ "Subset": {
+ "Mode":"multisource",
+ "SourceId": 2,
+ "NSources":2
+ }
+
+}
+ EOH
+ destination = "local/test.json"
+ }
+
+ # resources {
+ # cpu = 5000
+ # memory = 128
+ # network {
+ # mbits = 10000
+ # }
+ # }
+
+ } # task producer
+ }
+ #linux
+}
+
+
+
diff --git a/tests/manual/tests_via_nomad/run_test.sh b/tests/manual/tests_via_nomad/run_test.sh
deleted file mode 100755
index 0460ca5e6c5b8f45ffe9f822f5df7235a517a513..0000000000000000000000000000000000000000
--- a/tests/manual/tests_via_nomad/run_test.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-. ./clean_after_tests.sh
-nomad stop asapo-filemon-producer
-nomad run asapo-test_filemon_producer_toreceiver.nomad
-sleep 1
-nomad stop asapo-test
-nomad run asapo-test_filegen_filemon.nomad
-
diff --git a/tests/manual/tests_via_nomad/run_test_dummy_producer.sh b/tests/manual/tests_via_nomad/run_test_dummy_producer.sh
deleted file mode 100755
index dda2a1b3b5603b4df33af06a0a74277c7d1aac7c..0000000000000000000000000000000000000000
--- a/tests/manual/tests_via_nomad/run_test_dummy_producer.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-. ./clean_after_tests.sh
-nomad stop asapo-test
-nomad run asapo-test_dummy_producer_linux_noworker.nomad
-
diff --git a/tests/manual/tests_via_nomad/run_test_fullchain.sh b/tests/manual/tests_via_nomad/run_test_fullchain.sh
new file mode 100755
index 0000000000000000000000000000000000000000..9f842d002cbd45639a67c4501126051741e0fb81
--- /dev/null
+++ b/tests/manual/tests_via_nomad/run_test_fullchain.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+nomad stop asapo-filemon
+nomad stop asapo-filemon_batch
+nomad stop asapo-filemon_multisource
+nomad run asapo-test_filemon_batch.nomad
+sleep 1
+nomad stop asapo-test
+. ./clean_after_tests.sh
+
+nomad run asapo-test_filegen_worker.nomad
+
diff --git a/tests/manual/tests_via_nomad/run_test_fullchain_batch.sh b/tests/manual/tests_via_nomad/run_test_fullchain_batch.sh
new file mode 100755
index 0000000000000000000000000000000000000000..459aa9f665b846bd9b2d9aa079786081650bd552
--- /dev/null
+++ b/tests/manual/tests_via_nomad/run_test_fullchain_batch.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+nomad stop asapo-filemon
+nomad stop asapo-filemon_batch
+nomad stop asapo-filemon_multisource
+nomad run asapo-test_filemon_batch.nomad
+sleep 1
+nomad stop asapo-test
+. ./clean_after_tests.sh
+
+nomad run asapo-test_filegen_worker_batch.nomad
+
diff --git a/tests/manual/tests_via_nomad/run_test_fullchain_multisource.sh b/tests/manual/tests_via_nomad/run_test_fullchain_multisource.sh
new file mode 100755
index 0000000000000000000000000000000000000000..8a5a8687cc32dba70cd68321b2371168b70bbfe4
--- /dev/null
+++ b/tests/manual/tests_via_nomad/run_test_fullchain_multisource.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+nomad stop asapo-filemon
+nomad stop asapo-filemon_batch
+nomad stop asapo-filemon_multisource
+nomad run asapo-test_filemon_multisource.nomad
+sleep 1
+nomad stop asapo-test
+. ./clean_after_tests.sh
+
+nomad run asapo-test_filegen_worker_1M_multisource.nomad
+
diff --git a/tests/manual/tests_via_nomad/run_test_linuxonly.sh b/tests/manual/tests_via_nomad/run_test_linuxonly.sh
deleted file mode 100755
index 0397935522e74561609a497efbf7bd7f7f803698..0000000000000000000000000000000000000000
--- a/tests/manual/tests_via_nomad/run_test_linuxonly.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-. ./clean_after_tests.sh
-nomad stop asapo-filemon-producer
-nomad run asapo-test_filemon_producer_toreceiver.nomad
-sleep 1
-nomad stop asapo-test
-nomad run asapo-test_filegen_filemon_linuxonly.nomad
-