update noamd jobs

deploy/nomad_jobs/asapo-brokers.nmd.in

@@ -24,7 +24,7 @@ job "asapo-brokers" {
       config {
         network_mode = "host"
         dns_servers = ["127.0.0.1"]
-        image = "yakser/asapo-broker:feature_ha"
+        image = "yakser/asapo-broker:develop"
 	    force_pull = true
         volumes = ["local/config.json:/var/lib/broker/config.json"]
         logging {

deploy/nomad_jobs/asapo-receivers.nmd.in

@@ -24,7 +24,7 @@ job "asapo-receivers" {
       config {
         network_mode = "host"
         dns_servers = ["127.0.0.1"]
-        image = "yakser/asapo-receiver:feature_ha"
+        image = "yakser/asapo-receiver:develop"
 	    force_pull = true
         volumes = ["local/config.json:/var/lib/receiver/config.json",
                    "/bldocuments/support/asapo/data:/var/lib/receiver/data"]

deploy/nomad_jobs/asapo-services.nmd.in

@@ -12,7 +12,7 @@ job "asapo-services" {
       config {
         network_mode = "host"
         dns_servers = ["127.0.0.1"]
-        image = "yakser/asapo-authorizer:feature_ha"
+        image = "yakser/asapo-authorizer:develop"
 	    force_pull = true
         volumes = ["local/config.json:/var/lib/authorizer/config.json",
                    "/bldocuments/support/asapo/beamtime_beamline_mapping.txt:/var/lib/authorizer/beamtime_beamline_mapping.txt",
@@ -71,7 +71,7 @@ job "asapo-services" {
       config {
         network_mode = "host"
         dns_servers = ["127.0.0.1"]
-        image = "yakser/asapo-discovery:feature_ha"
+        image = "yakser/asapo-discovery:develop"
 	    force_pull = true
         volumes = ["local/config.json:/var/lib/discovery/config.json"]
         logging {

producer/event_monitor_producer/src/system_folder_watch_macos_dummy.h

@@ -11,13 +11,13 @@
 namespace asapo {
 
 class SystemFolderWatch {
- public:
-  VIRTUAL Error StartFolderMonitor(const std::string &root_folder, const std::vector<std::string> &monitored_folders) {
-      return nullptr;
-  };
-  VIRTUAL FilesToSend GetFileList(Error* err) {
-      return {};
-  };
+  public:
+    VIRTUAL Error StartFolderMonitor(const std::string& root_folder, const std::vector<std::string>& monitored_folders) {
+        return nullptr;
+    };
+    VIRTUAL FilesToSend GetFileList(Error* err) {
+        return {};
+    };
 };
 
 }

tests/manual/tests_via_nomad/asapo-test_dummy_producer.nomad

@@ -90,92 +90,92 @@ job "asapo-test" {
 
   }
   #linux
-}
 
+  group "worker-linux1" {
+
+    constraint {
+      attribute = "${attr.kernel.name}"
+      value = "linux"
+    }
 
-group "worker-linux1" {
+    #    constraint {
+    #      attribute = "${meta.location}"
+    #      operator = "!="
+    #      value = "petra3"
+    #    }
 
-  constraint {
-    attribute = "${attr.kernel.name}"
-    value = "linux"
-  }
+    count = 1
 
-  #    constraint {
-  #      attribute = "${meta.location}"
-  #      operator = "!="
-  #      value = "petra3"
-  #    }
-
-  count = 1
-
-  task "worker-linux" {
-    driver = "raw_exec"
-
-    config {
-      command = "local/getnext_broker"
-      args = [
-        "psana002:8400",
-        "asapo_test1",
-        "16",
-        "oTsKsj8i6WcW_gVzeIFvZCtSfMErjDELJEyAI23n7Ik=",
-        "30000"]
-    }
+    task "worker-linux" {
+      driver = "raw_exec"
 
-    resources {
-      cpu = 5000
-      memory = 128
-      network {
-        mbits = 10000
+      config {
+        command = "local/getnext_broker"
+        args = [
+          "psana002:8400",
+          "asapo_test1",
+          "16",
+          "oTsKsj8i6WcW_gVzeIFvZCtSfMErjDELJEyAI23n7Ik=",
+          "30000"]
       }
-    }
 
-    artifact {
-      source = "http://nims.desy.de/extra/asapo/getnext_broker"
+      resources {
+        cpu = 5000
+        memory = 128
+        network {
+          mbits = 10000
+        }
+      }
+
+      artifact {
+        source = "http://nims.desy.de/extra/asapo/getnext_broker"
+      }
     }
+
   }
+  # worker-linux1
 
-}
-# worker-linux1
 
+  group "worker-linux2" {
+
+    constraint {
+      attribute = "${attr.kernel.name}"
+      value = "linux"
+    }
 
-group "worker-linux2" {
+    #    constraint {
+    #      attribute = "${meta.location}"
+    #      operator = "!="
+    #      value = "petra3"
+    #    }
 
-  constraint {
-    attribute = "${attr.kernel.name}"
-    value = "linux"
-  }
+    count = 1
 
-  #    constraint {
-  #      attribute = "${meta.location}"
-  #      operator = "!="
-  #      value = "petra3"
-  #    }
-
-  count = 1
-
-  task "worker-linux" {
-    driver = "raw_exec"
-
-    config {
-      command = "local/getnext_broker"
-      args = [
-        "psana002:8400",
-        "asapo_test2",
-        "16",
-        "yzgAcLmijSLWIm8dBiGNCbc0i42u5HSm-zR6FRqo__Y=",
-        "30000"]
-    }
-    resources {
-      cpu = 5000
-      memory = 128
-      network {
-        mbits = 10000
+    task "worker-linux" {
+      driver = "raw_exec"
+
+      config {
+        command = "local/getnext_broker"
+        args = [
+          "psana002:8400",
+          "asapo_test2",
+          "16",
+          "yzgAcLmijSLWIm8dBiGNCbc0i42u5HSm-zR6FRqo__Y=",
+          "30000"]
+      }
+      resources {
+        cpu = 5000
+        memory = 128
+        network {
+          mbits = 10000
+        }
       }
-    }
 
-    artifact {
-      source = "http://nims.desy.de/extra/asapo/getnext_broker"
+      artifact {
+        source = "http://nims.desy.de/extra/asapo/getnext_broker"
+      }
     }
+
   }
 
 }

tests/manual/tests_via_nomad/asapo-test_filegen_filemon.nomad

@@ -61,7 +61,7 @@ job "asapo-test" {
           "10M",
           "10000",
           "120",
-          "/tmp/asapo/test_in/test_folder/file_lin"]
+          "/run/user/data/file_lin"]
       }
 
       artifact {

tests/manual/tests_via_nomad/asapo-test_filemon_producer_toreceiver.nomad

@@ -92,8 +92,8 @@ job "asapo-filemon-producer" {
  "Mode":"tcp",
  "NThreads":8,
  "LogLevel":"debug",
- "RootMonitoredFolder":"/tmp/asapo/test_in",
- "MonitoredSubFolders":["test_folder"],
+ "RootMonitoredFolder":"/run/user",
+ "MonitoredSubFolders":["data"],
  "IgnoreExtentions":["tmp"],
  "RemoveAfterSend":true
 }