Merge lp:~noise/tanuki-agent/tutorial-twerks into lp:tanuki-agent

[Bret Barker]

fix agent configparser cfg; tweaks to tutorial

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'agent.py'
--- agent.py	2015-11-25 19:37:18 +0000
+++ agent.py	2015-11-25 20:48:01 +0000
@@ -7,8 +7,8 @@
 Tanuki Agent
 
 Usage:
-  agent.py [-vq] [--once] [--drain] [--register] [--debug] \
-      [--local-test <test_opportunity_json_file>] <configfile>
+  agent.py [-vq] [--once] [--drain] [--register] [--debug] <configfile>
+  agent.py [-vq] [--debug] --local-test <test_opportunity_json_file> <configfile>
   agent.py --default-config [<configfile>]
   agent.py --interactive-login [<configfile>]
 

=== modified file 'docs/tutorial2.md'
--- docs/tutorial2.md	2015-11-24 19:07:08 +0000
+++ docs/tutorial2.md	2015-11-25 20:48:01 +0000
@@ -261,8 +261,9 @@
 For the purposes of Product Integration testing, we are only concerned about the list of snaps that compose the product and some additional metadata decribed here:
 
 -   ```name```: A short name to identify this Product, does not need to be unique.
+-   ```primary_snap_name```: the fully qualified name of the snap
+    package that defines this product and access to product test information.
 -   ```release```: the Ubuntu Core release this products aims for (currently "15.04-core" or "rolling-core" as known by the Store)
--   ```base_image_reference```: optional (TODO: we should make it optional as it shouldn't be needed in all-snaps land anymore)
 -   ```snaps```: the list of snap names that that comprise the product
 
 TODO: instruct them to export SSO_USERNAME or have the agent login step do it.
@@ -284,7 +285,7 @@
         ]
     }'
 
-output will contain the ID newly created product definition. You will need to export this as an environment variable for use in later API calls as follows:
+the output will contain the ID newly created product definition. You will need to export this as an environment variable for use in later API calls as follows:
 
     export PRODUCT_ID=<id from output above>
 
@@ -306,17 +307,18 @@
 
     ./api_example.py -X POST config.ini https://spi.canonical.com/products/$PRODUCT_ID/tests/specs --data '{
         "name": "Tutorial Example Test Specification",
+        "platform": "armhf",
         "product_id": "$PRODUCT_ID",
         "channels": [ ['base': 'stable', 'update': 'edge'] ],
         "test_payload": {
             "tarball_url": "https://spi.canonical.com/assets/test_tarball2.tar.gz",
-            "test_cmd": "./test"
+            "test_cmd": "./test2"
         }
     }'
 
 At this point the system is configured for your product and tests, and will supervise the Store for new versions of the snaps listed in your Product.
 
-TODO: note about not being in all-snaps land yet.
+TODO: note about not being in all-snaps land yet and how that affects os/kernel.
 
 
 ### First test run
@@ -365,7 +367,7 @@
             "event_type": "QUEUED_FOR_AGENTS"
             },
             {
-            "platform": "spi-tutorial-raspi2",
+            "platform": "armhf",
             "timestamp": "2015-10-28T18:34:58.988000+00:00",
             "agent_group": "default",
             "agent_id": "special",
@@ -452,12 +454,12 @@
 
     [environment]
     ARTIFACT_DIR='/home/user/artifacts'
-
+ 
 #### Generated GM Candidate images
 
 The images that are generated by the provisioning kit may be stored for later use. For example if tests pass and you would like to release the image you will want to retrieve the binary from the Agent host.
 
-The sample provisioning kit stores the images in a ./run/images
+The sample provisioning kit stores the images in a ```./run/images```
 subdirector of the agent installation. You are responsible for
 handling transport of the images from there to a storage system of your choice.