Move example code in pkg/example to examples/ (#365)

Signed-off-by: David Chung <[email protected]>

Author: David Chung

Makefile

@@ -115,13 +115,13 @@ endif
 	$(call build_binary,infrakit,github.com/docker/infrakit/cmd/cli)
 	$(call build_binary,infrakit-manager,github.com/docker/infrakit/cmd/manager)
 	$(call build_binary,infrakit-group-default,github.com/docker/infrakit/cmd/group)
-	$(call build_binary,infrakit-flavor-combo,github.com/docker/infrakit/pkg/example/flavor/combo)
-	$(call build_binary,infrakit-flavor-swarm,github.com/docker/infrakit/pkg/example/flavor/swarm)
-	$(call build_binary,infrakit-flavor-vanilla,github.com/docker/infrakit/pkg/example/flavor/vanilla)
-	$(call build_binary,infrakit-flavor-zookeeper,github.com/docker/infrakit/pkg/example/flavor/zookeeper)
-	$(call build_binary,infrakit-instance-file,github.com/docker/infrakit/pkg/example/instance/file)
-	$(call build_binary,infrakit-instance-terraform,github.com/docker/infrakit/pkg/example/instance/terraform)
-	$(call build_binary,infrakit-instance-vagrant,github.com/docker/infrakit/pkg/example/instance/vagrant)
+	$(call build_binary,infrakit-flavor-combo,github.com/docker/infrakit/examples/flavor/combo)
+	$(call build_binary,infrakit-flavor-swarm,github.com/docker/infrakit/examples/flavor/swarm)
+	$(call build_binary,infrakit-flavor-vanilla,github.com/docker/infrakit/examples/flavor/vanilla)
+	$(call build_binary,infrakit-flavor-zookeeper,github.com/docker/infrakit/examples/flavor/zookeeper)
+	$(call build_binary,infrakit-instance-file,github.com/docker/infrakit/examples/instance/file)
+	$(call build_binary,infrakit-instance-terraform,github.com/docker/infrakit/examples/instance/terraform)
+	$(call build_binary,infrakit-instance-vagrant,github.com/docker/infrakit/examples/instance/vagrant)
 
 install:
 	@echo "+ $@"

README.md

@@ -0,0 +1,56 @@
+[
+    {
+        "Plugin" : "group-default",
+        "Launch" : {
+            "Exec" : "os",
+            "Properties": {
+                "Cmd" : "infrakit-group-default --poll-interval 500ms --name group-stateless --log 5 > {{env "LOG_DIR"}}/group-default-{{unixtime}}.log 2>&1 &",
+                "SamePgID" : true
+            }
+        }
+    }
+    ,
+    {
+        "Plugin" : "instance-file",
+        "Launch" : {
+            "Exec" : "os",
+            "Properties" : {
+                "Cmd" : "infrakit-instance-file --dir {{env "TUTORIAL_DIR"}} --log 5 > {{env "LOG_DIR"}}/instance-file-{{unixtime}}.log 2>&1",
+                "SamePgID" : true
+            }
+        }
+    }
+    ,
+    {
+        "Plugin" : "instance-vagrant",
+        "Launch" : {
+            "Exec" : "os",
+            "Properties" : {
+                "Cmd" : "infrakit-instance-vagrant --log 5 > {{env "LOG_DIR"}}/instance-vagrant-{{unixtime}}.log 2>&1",
+                "SamePgID" : true
+            }
+        }
+    }
+    ,
+    {
+        "Plugin" : "flavor-vanilla",
+        "Launch" : {
+            "Exec" : "os",
+            "Properties" : {
+                "Cmd" : "infrakit-flavor-vanilla --log 5 > {{env "LOG_DIR"}}/flavor-vanilla-{{unixtime}}.log 2>&1",
+                "SamePgID" : true
+            }
+        }
+    }
+    ,
+    {
+        "Plugin" : "flavor-swarm",
+        "Launch" : {
+            "Exec" : "os",
+            "Properties" : {
+                "Cmd" : "infrakit-flavor-swarm --host {{env "SWARM_MANAGER"}} --log 5 > {{env "LOG_DIR"}}/flavor-swarm-{{unixtime}}.log 2>&1",
+                "SamePgID" : true
+            }
+        }
+    }
+]

pkg/example/flavor/combo/README.md renamed to examples/flavor/combo/README.md

@@ -4,7 +4,7 @@ set -o errexit
 set -o nounset
 
 HERE="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-cd "$HERE/.."
+cd "$HERE/../../.."
 
 export PATH=$PWD/build:$PATH
 
@@ -59,7 +59,7 @@ export E2E_SWARM_DIR=$E2E_SWARM_DIR
 export SWARM_MANAGER="tcp://192.168.2.200:4243"
 
 # note -- on exit, this won't clean up the plugins started by the cli since they will be in a separate process group
-infrakit plugin start --wait --config-url file:///$PWD/scripts/e2e-test-plugins.json --os group-default instance-vagrant flavor-swarm flavor-vanilla &
+infrakit plugin start --wait --config-url file:///$PWD/examples/flavor/swarm/e2e-plugins.json --os group-default instance-vagrant flavor-swarm flavor-vanilla &
 
 starterpid=$!
 echo "plugin start pid=$starterpid"
@@ -106,7 +106,7 @@ expect_output_lines "7 plugins should be discoverable" "infrakit plugin ls -q" "
 expect_output_lines "0 instances should exist" "infrakit instance describe -q --name instance-vagrant" "0"
 
 echo "Commiting manager"
-infrakit group commit pkg/example/flavor/swarm/swarm-vagrant-manager.json
+infrakit group commit examples/flavor/swarm/swarm-vagrant-manager.json
 
 echo 'Waiting for group to be provisioned'
 sleep 60
@@ -116,7 +116,7 @@ expect_output_lines "1 instances should exist in group" "infrakit group describe
 expect_output_lines "1 instances should exist" "infrakit instance describe -q --name instance-vagrant" "1"
 
 echo "Commiting workers"
-infrakit group commit pkg/example/flavor/swarm/swarm-vagrant-workers.json
+infrakit group commit examples/flavor/swarm/swarm-vagrant-workers.json
 
 echo 'Waiting for group to be provisioned'
 sleep 120
@@ -125,6 +125,11 @@ expect_output_lines "Should be watching two groups" "infrakit group ls -q" "2"
 expect_output_lines "2 instances should exist in group" "infrakit group describe swarm-workers -q" "2"
 expect_output_lines "3 instances should exist" "infrakit instance describe -q --name instance-vagrant" "3"
 
+echo "Checking Docker Swarm"
+
+docker -H $SWARM_MANAGER node ls
+
+
 echo "Destroying workers"
 infrakit group destroy swarm-workers
 expect_output_lines "1 instances should exist" "infrakit instance describe -q --name instance-vagrant" "1"