From b73fb543a73165ea0d2e8091e5b4620af080d0f9 Mon Sep 17 00:00:00 2001
From: Valentin Reis <vreis@anl.gov>
Date: Thu, 13 Jun 2019 11:06:59 -0500
Subject: [PATCH] refactor, fix singularity test.

---
 deployments/restart-runners.sh |  9 +---
 dhrun/all-tests.dh             | 78 ++++++++++++++++++++++------------
 2 files changed, 52 insertions(+), 35 deletions(-)

diff --git a/deployments/restart-runners.sh b/deployments/restart-runners.sh
index c1adefb..32d7997 100755
--- a/deployments/restart-runners.sh
+++ b/deployments/restart-runners.sh
@@ -1,19 +1,14 @@
 #!/usr/bin/env bash
 
-echo "restarted runner."
 ssh root@140.221.10.9 systemctl restart gitlab-runner2.service
-
 echo "restarted runner."
 ssh root@129.114.111.114 systemctl restart gitlab-runner2.service
-
 echo "restarted runner."
 ssh root@129.114.110.3 systemctl restart gitlab-runner2.service
-
 echo "restarted runner."
 ssh root@129.114.111.116 systemctl restart gitlab-runner2.service
-
 echo "restarted runner."
 ssh root@129.114.33.201 systemctl restart gitlab-runner2.service
-
 echo "restarted runner."
-ssh gitlab-runner@argo-phi1 sudo systemctl restart gitlab-runner.service
+ssh gitlab-runner@argo-phi1.mcs sudo systemctl restart gitlab-runner.service
+echo "restarted runner."
diff --git a/dhrun/all-tests.dh b/dhrun/all-tests.dh
index eb99d18..5c08512 100644
--- a/dhrun/all-tests.dh
+++ b/dhrun/all-tests.dh
@@ -44,6 +44,8 @@
             manifestDir ++ "basic.yml"
         , perf =
             manifestDir ++ "perfwrap.yml"
+        , singularity =
+            manifestDir ++ "singularity.yml"
         }
   
   let ifTest =
@@ -54,18 +56,13 @@
   
   let ifTestList = ifTest (List Text) ([] : List Text)
   
-  let ifTestTimeout =
-        ifTest
-        (Optional Natural)
-        ([] : Optional Natural)
-        ([ 600 ] : Optional Natural)
-  
   let withDaemon =
-          λ(runArg : argotypes.MkRun)
+          λ(daemonArg : argotypes.MkDaemon)
+        → λ(runArg : argotypes.MkRun)
         → λ(runOverrides : types.Cmd → types.Cmd)
         → λ(extraCmds : List types.Cmd)
         → makeExtended
-          (   argo.nrmd.defarg
+          (   daemonArg
             ⫽ { daemonavoids =
                   ifTestList [ "Traceback", "ValueError" ]
               , powercap =
@@ -74,29 +71,51 @@
           )
           idCmd
           (   runArg
-            ⫽ { cmdavoids = runArg.cmdavoids # ifTestList [ "Traceback" ] }
+            ⫽ { cmdavoids =
+                  runArg.cmdavoids # ifTestList [ "Traceback", "ValueError" ]
+              }
+          )
+          (   λ(c : types.Cmd)
+            → runOverrides
+              (   c
+                ⫽ { timeout =
+                      ifTest
+                      (Optional Natural)
+                      ([] : Optional Natural)
+                      ([ 600 ] : Optional Natural)
+                  }
+              )
           )
-          (λ(c : types.Cmd) → runOverrides (c ⫽ { timeout = ifTestTimeout }))
           extraCmds
   
   let withDaemonNoExtras =
           λ(runArg : argotypes.MkRun)
         → λ(runOverrides : types.Cmd → types.Cmd)
-        → withDaemon runArg runOverrides ([] : List types.Cmd)
+        → withDaemon argo.nrmd.defarg runArg runOverrides ([] : List types.Cmd)
   
-  let withDaemonExtraProgresstest =
-          λ(runArg : argotypes.MkRun)
+  let withDaemonExtraListen =
+          λ(filter : Text)
+        → λ(doFilter : Bool)
+        → λ(runArg : argotypes.MkRun)
         → λ(runOverrides : types.Cmd → types.Cmd)
         → withDaemon
+          argo.nrmd.defarg
           runArg
           runOverrides
           [ argo.listen.mk
-            (argo.listen.defarg cn ⫽ { filter = "progress", doFilter = True })
+            (argo.listen.defarg cn ⫽ { filter = filter, doFilter = doFilter })
           ]
   
-  let basicRun = λ(name : Text) → argo.run.defarg name manifests.basic cn
+  let withDaemonExtraProgresstest = withDaemonExtraListen "performance" True
+  
+  let mkrun =
+        λ(manifest : Text) → λ(name : Text) → argo.run.defarg name manifest cn
+  
+  let basicRun = mkrun manifests.basic
+  
+  let perfRun = mkrun manifests.perf
   
-  let perfRun = λ(name : Text) → argo.run.defarg name manifests.perf cn
+  let singularityRun = mkrun manifests.singularity
   
   in  { run =
           withDaemonNoExtras (basicRun "true") idCmd
@@ -117,26 +136,29 @@
           )
           idCmd
       , listen =
-          withDaemon
+          withDaemonExtraListen
+          ","
+          False
           (basicRun "sleep" ⫽ { args = [ "1" ] })
           idCmd
-          [ argo.listen.mk (argo.listen.defarg cn ⫽ { doFilter = False }) ]
       , power =
-          withDaemon
+          withDaemonExtraListen
+          "power"
+          True
           (basicRun "sleep" ⫽ { args = [ "15" ] })
           idCmd
-          [ argo.listen.mk
-            (argo.listen.defarg cn ⫽ { filter = "power", doFilter = True })
-          ]
       , performance =
-          withDaemon
+          withDaemonExtraListen
+          "performance"
+          True
           (perfRun "sleep" ⫽ { args = [ "15" ] })
           idCmd
-          [ argo.listen.mk
-            (   argo.listen.defarg cn
-              ⫽ { filter = "performance", doFilter = True }
-            )
-          ]
+      , run-singularity =
+          withDaemon
+          (argo.nrmd.defarg ⫽ { singularity = True })
+          (singularityRun "true")
+          idCmd
+          ([] : List types.Cmd)
       , qmcpack =
           withDaemonExtraProgresstest
           (   basicRun "mpiexec"
-- 
2.26.2