waterslager, build nettle statically, copy tarball to sra0

diff --git a/master.cfg b/master.cfg
index dc5cb1c1be587cabd449741c9cab46c8b1239fab..96ca08a1d97f3a087e765c8634a67a6924b995f7 100644 (file)
--- a/master.cfg
+++ b/master.cfg
@@ -18,6 +18,7 @@ from buildbot.config.builder import BuilderConfig
 from buildbot.steps.master import Assert
 from buildbot.steps.source.git import Git
 from buildbot.steps.shell import ShellCommand
+from buildbot.steps.shellsequence import ShellSequence, ShellArg
 from buildbot.steps.trigger import Trigger
 from buildbot.process.factory import BuildFactory
 from buildbot.process.properties import Secret
@@ -492,44 +493,37 @@ c['builders'].append(BuilderConfig(
         ),
         ShellCommand(
             name="build waterslager",
+            # requires worker has USE dev-libs/nettle +static-libs
+            env={"NETTLE_STATIC":"yes"},
             command=["cargo","build","--release"],
             haltOnFailure=True,
         ),
-        ShellCommand(
-            name="rm waterslager dir",
-            command=["rm","-rf","waterslager"],
-            haltOnFailure=True,
-        ),
-        ShellCommand(
-            name="mkdir waterslager",
-            command=["mkdir","-p","waterslager"],
-            haltOnFailure=True,
-        ),
-        ShellCommand(
-            name="prep binary",
-            command=["cp","target/release/waterslager","waterslager"],
-            haltOnFailure=True,
-        ),
-        ShellCommand(
-            name="prep certs",
-            command=["cp","-R","trust","waterslager"],
-            haltOnFailure=True,
-        ),
-        ShellCommand(
-            name="rm waterslager archive",
-            command=["rm","-f","waterslager.tar.gz"],
+        ShellSequence(
+            name="tar archive",
+            commands=[
+                ShellArg(command=["rm","-rf","waterslager"],
+                         haltOnFailure=True,logname="step"),
+                ShellArg(command=["mkdir","-p","waterslager"],
+                         haltOnFailure=True,logname="step"),
+                ShellArg(command=["cp","target/release/waterslager","waterslager"],
+                         haltOnFailure=True,logname="step"),
+                ShellArg(command=["cp","-R","trust","waterslager"],
+                         haltOnFailure=True,logname="step"),
+                ShellArg(command=["rm","-f","waterslager.tar.gz"],
+                         haltOnFailure=True,logname="step"),
+                ShellArg(command=["tar","czf","waterslager.tar.gz","waterslager"],
+                         haltOnFailure=True,logname="step"),
+            ],
             haltOnFailure=True,
         ),
-        ShellCommand(
-            name="tar waterslager",
-            command=["tar","czf","waterslager.tar.gz","waterslager"],
+        ShellSequence(
+            name="copy waterslager to sra0",
+            commands=[
+                ShellArg(command=["scp","waterslager.tar.gz","sra0:~"],
+                         haltOnFailure=True,logname="step"),
+            ],
             haltOnFailure=True,
-        ),
-
-        # ShellCommand(
-        #     name="copy waterslager to lin0",
-        #     haltOnFailure=True,
-        #     command=["scp","target/release/waterslager","lin0:~"]),
+        )
         # ShellCommand(
         #     name="clean build dir",
         #     command=["cargo","clean"]),