Commit b73fb543 authored by Valentin Reis's avatar Valentin Reis

refactor, fix singularity test.

parent 4f1a97ce
Pipeline #7694 failed with stages
in 28 minutes and 24 seconds
#!/usr/bin/env bash #!/usr/bin/env bash
echo "restarted runner."
ssh root@140.221.10.9 systemctl restart gitlab-runner2.service ssh root@140.221.10.9 systemctl restart gitlab-runner2.service
echo "restarted runner." echo "restarted runner."
ssh root@129.114.111.114 systemctl restart gitlab-runner2.service ssh root@129.114.111.114 systemctl restart gitlab-runner2.service
echo "restarted runner." echo "restarted runner."
ssh root@129.114.110.3 systemctl restart gitlab-runner2.service ssh root@129.114.110.3 systemctl restart gitlab-runner2.service
echo "restarted runner." echo "restarted runner."
ssh root@129.114.111.116 systemctl restart gitlab-runner2.service ssh root@129.114.111.116 systemctl restart gitlab-runner2.service
echo "restarted runner." echo "restarted runner."
ssh root@129.114.33.201 systemctl restart gitlab-runner2.service ssh root@129.114.33.201 systemctl restart gitlab-runner2.service
echo "restarted runner." 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."
...@@ -44,6 +44,8 @@ ...@@ -44,6 +44,8 @@
manifestDir ++ "basic.yml" manifestDir ++ "basic.yml"
, perf = , perf =
manifestDir ++ "perfwrap.yml" manifestDir ++ "perfwrap.yml"
, singularity =
manifestDir ++ "singularity.yml"
} }
let ifTest = let ifTest =
...@@ -54,18 +56,13 @@ ...@@ -54,18 +56,13 @@
let ifTestList = ifTest (List Text) ([] : List Text) let ifTestList = ifTest (List Text) ([] : List Text)
let ifTestTimeout =
ifTest
(Optional Natural)
([] : Optional Natural)
([ 600 ] : Optional Natural)
let withDaemon = let withDaemon =
λ(runArg : argotypes.MkRun) λ(daemonArg : argotypes.MkDaemon)
→ λ(runArg : argotypes.MkRun)
→ λ(runOverrides : types.Cmd → types.Cmd) → λ(runOverrides : types.Cmd → types.Cmd)
→ λ(extraCmds : List types.Cmd) → λ(extraCmds : List types.Cmd)
→ makeExtended → makeExtended
( argo.nrmd.defarg ( daemonArg
⫽ { daemonavoids = ⫽ { daemonavoids =
ifTestList [ "Traceback", "ValueError" ] ifTestList [ "Traceback", "ValueError" ]
, powercap = , powercap =
...@@ -74,29 +71,51 @@ ...@@ -74,29 +71,51 @@
) )
idCmd idCmd
( runArg ( 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 extraCmds
let withDaemonNoExtras = let withDaemonNoExtras =
λ(runArg : argotypes.MkRun) λ(runArg : argotypes.MkRun)
→ λ(runOverrides : types.Cmd → types.Cmd) → λ(runOverrides : types.Cmd → types.Cmd)
→ withDaemon runArg runOverrides ([] : List types.Cmd) → withDaemon argo.nrmd.defarg runArg runOverrides ([] : List types.Cmd)
let withDaemonExtraProgresstest = let withDaemonExtraListen =
λ(runArg : argotypes.MkRun) λ(filter : Text)
→ λ(doFilter : Bool)
→ λ(runArg : argotypes.MkRun)
→ λ(runOverrides : types.Cmd → types.Cmd) → λ(runOverrides : types.Cmd → types.Cmd)
→ withDaemon → withDaemon
argo.nrmd.defarg
runArg runArg
runOverrides runOverrides
[ argo.listen.mk [ 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 = in { run =
withDaemonNoExtras (basicRun "true") idCmd withDaemonNoExtras (basicRun "true") idCmd
...@@ -117,26 +136,29 @@ ...@@ -117,26 +136,29 @@
) )
idCmd idCmd
, listen = , listen =
withDaemon withDaemonExtraListen
","
False
(basicRun "sleep" ⫽ { args = [ "1" ] }) (basicRun "sleep" ⫽ { args = [ "1" ] })
idCmd idCmd
[ argo.listen.mk (argo.listen.defarg cn ⫽ { doFilter = False }) ]
, power = , power =
withDaemon withDaemonExtraListen
"power"
True
(basicRun "sleep" ⫽ { args = [ "15" ] }) (basicRun "sleep" ⫽ { args = [ "15" ] })
idCmd idCmd
[ argo.listen.mk
(argo.listen.defarg cn ⫽ { filter = "power", doFilter = True })
]
, performance = , performance =
withDaemon withDaemonExtraListen
"performance"
True
(perfRun "sleep" ⫽ { args = [ "15" ] }) (perfRun "sleep" ⫽ { args = [ "15" ] })
idCmd idCmd
[ argo.listen.mk , run-singularity =
( argo.listen.defarg cn withDaemon
⫽ { filter = "performance", doFilter = True } (argo.nrmd.defarg ⫽ { singularity = True })
) (singularityRun "true")
] idCmd
([] : List types.Cmd)
, qmcpack = , qmcpack =
withDaemonExtraProgresstest withDaemonExtraProgresstest
( basicRun "mpiexec" ( basicRun "mpiexec"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment