Change: all actions must have a "where"

1 files changed, 21 insertions, 18 deletions

diff --git a/yarns/150-pipelines.yarn b/yarns/150-pipelines.yarn
index dd5cde2..a63ce02 100644
--- a/yarns/150-pipelines.yarn
+++ b/yarns/150-pipelines.yarn
@@ -31,13 +31,16 @@ They're described like resources like this:
         },
         "actions": [
             {
-                "shell": "git clone git://git.liw.fi/ick2-website src" }
+                "shell": "git clone git://git.liw.fi/ick2-website src",
+                "where": "host"
             },
             {
-                "shell": "cd src && ikiwiki --setup ikiwiki.setup"
+                "shell": "cd src && ikiwiki --setup ikiwiki.setup",
+                "where": "host"
             },
             {
-                "shell": "cd html && rsync -a --delete . server::/srv/http/ick2/."
+                "shell": "cd html && rsync -a --delete . server::/srv/http/ick2/.",
+                "where": "host"
             }
         ]
     }
@@ -75,9 +78,9 @@ running them. We start by starting an instance of the controller.
     ... {
     ...     "pipeline": "build_website",
     ...     "actions": [
-    ...         { "shell": "git clone git://repo src" },
-    ...         { "shell": "mkdir html" },
-    ...         { "shell": "ikiwiki src html" }
+    ...         { "where": "host", "shell": "git clone git://repo src" },
+    ...         { "where": "host", "shell": "mkdir html" },
+    ...         { "where": "host", "shell": "ikiwiki src html" }
     ...     ]
     ... }
     THEN result has status code 201
@@ -85,9 +88,9 @@ running them. We start by starting an instance of the controller.
     ... {
     ...     "pipeline": "build_website",
     ...     "actions": [
-    ...         { "shell": "git clone git://repo src" },
-    ...         { "shell": "mkdir html" },
-    ...         { "shell": "ikiwiki src html" }
+    ...         { "where": "host", "shell": "git clone git://repo src" },
+    ...         { "where": "host", "shell": "mkdir html" },
+    ...         { "where": "host", "shell": "ikiwiki src html" }
     ...     ]
     ... }
 
@@ -107,9 +110,9 @@ Creating a new pipeline with the same name is forbidden.
     ...         {
     ...             "pipeline": "build_website",
     ...              "actions": [
-    ...                 { "shell": "git clone git://repo src" },
-    ...                 { "shell": "mkdir html" },
-    ...                 { "shell": "ikiwiki src html" }
+    ...                 { "where": "host", "shell": "git clone git://repo src" },
+    ...                 { "where": "host", "shell": "mkdir html" },
+    ...                 { "where": "host", "shell": "ikiwiki src html" }
     ...             ]
     ...         }
     ...     ]
@@ -123,9 +126,9 @@ Creating a new pipeline with the same name is forbidden.
     ... {
     ...     "pipeline": "build_website",
     ...     "actions": [
-    ...         { "shell": "git clone git://repo src" },
-    ...         { "shell": "mkdir html" },
-    ...         { "shell": "ikiwiki src html" }
+    ...         { "where": "host", "shell": "git clone git://repo src" },
+    ...         { "where": "host", "shell": "mkdir html" },
+    ...         { "where": "host", "shell": "ikiwiki src html" }
     ...     ]
     ... }
 
@@ -134,7 +137,7 @@ Creating a new pipeline with the same name is forbidden.
     ... {
     ...     "pipeline": "build_website",
     ...     "actions": [
-    ...         { "shell": "build-it" }
+    ...         { "where": "host", "shell": "build-it" }
     ...     ]
     ... }
     THEN result has status code 200
@@ -142,7 +145,7 @@ Creating a new pipeline with the same name is forbidden.
     ... {
     ...     "pipeline": "build_website",
     ...     "actions": [
-    ...         { "shell": "build-it" }
+    ...         { "where": "host", "shell": "build-it" }
     ...     ]
     ... }
 
@@ -152,7 +155,7 @@ Creating a new pipeline with the same name is forbidden.
     ... {
     ...     "pipeline": "build_website",
     ...     "actions": [
-    ...         { "shell": "build-it" }
+    ...         { "where": "host", "shell": "build-it" }
     ...     ]
     ... }