Merge lp:~vila/ubuntu-ci-services-itself/doc-fixes into lp:ubuntu-ci-services-itself

[Vincent Ladeuil]

Minor doc fixes.

Here are a few uncommited changes I was accrying on my trunk from some minor
issues I encountered and are not worth fixing yet. I still prefer to have
these recorded in shared place in case others ran into similar issues.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:257
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/196/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/196/rebuild

review: Needs Fixing (continuous-integration)

[Chris Johnston (cjohnston)]

On Thu, Feb 20, 2014 at 11:14 AM, Vincent Ladeuil <email address hidden>wrote:

> -To use this app, you will need to create the files
> -~/.ubuntu-ci/auth_config.yaml and ~/.ubuntu-ci/config.yaml.
> +To use this app, you will need to create the files ~/.ubuntu-ci
> +(./cli/ubuntu-ci-autoconfig can help). It needs to include:
>

s/files/file please as it is now only one file. Good catch on the update

[lp:~vila/ubuntu-ci-services-itself/doc-fixes]

258. By Vincent Ladeuil on 2014-02-20

Thanks for catch Andy !

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:258
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/197/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/197/rebuild

review: Needs Fixing (continuous-integration)

[lp:~vila/ubuntu-ci-services-itself/doc-fixes]

259. By Vincent Ladeuil on 2014-02-20

Tsk, tsk, typo. Thanks Chris ;)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:259
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/198/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/198/rebuild

review: Approve (continuous-integration)

[Chris Johnston (cjohnston)]

review: Approve

=== modified file 'cli/README'
--- cli/README	2014-01-10 15:35:32 +0000
+++ cli/README	2014-02-20 17:08:27 +0000
@@ -1,11 +1,12 @@
-To use this app, you will need to create the files 
-~/.ubuntu-ci/auth_config.yaml and ~/.ubuntu-ci/config.yaml. 
+To use this app, you will need to create the file ~/.ubuntu-ci
+(./cli/ubuntu-ci-autoconfig can help). It needs to include:
 
-auth_config.yaml needs to include:
+from your cloud credentials:
 - 'auth_url'
 - 'auth_user'
 - 'auth_password'
 - 'auth_tenant_name'
+- 'auth_region_name'
 
-config.yaml needs to include:
+from your juju deployment:
 - 'ci_url'
 
=== modified file 'test_runner/tstrun/testbed.py'
--- test_runner/tstrun/testbed.py	2014-02-17 17:54:55 +0000
+++ test_runner/tstrun/testbed.py	2014-02-20 17:08:27 +0000
@@ -209,6 +209,11 @@
                 # but there should be only one IP address defined so we just
                 # get the first one and avoid the need for a config option for
                 # the network name.
+
+                # FIXME: ev encountered a case where the instance is in an
+                # error state and has no networks leading to a KeyError
+                # exception. It should be handled in its own branch based on
+                # 'status == "ERROR"'. -- vila 2014-02-18
                 self.ip = networks[0][0]
                 log.info('Got IP {} for {}'.format(self.ip, self.instance.id))
                 # FIXME: Right place to report how long it took to spin up the
@@ -298,7 +303,7 @@
     # precise_image = ('ubuntu-released/ubuntu-precise-12.04'
     #                 '-amd64-server-20131205-disk1.img')
     saucy_image = ('ubuntu-released/ubuntu-saucy-13.10'
-                   '-amd64-server-20140129-disk1.img')
+                   '-amd64-server-20140212-disk1.img')
     test_bed = TestBed('vila1', 'm1.small', saucy_image,
                        lambda x: None)
     test_bed.setup()
 
=== modified file 'tests/run.py'
--- tests/run.py	2014-02-17 10:13:29 +0000
+++ tests/run.py	2014-02-20 17:08:27 +0000
@@ -94,7 +94,7 @@
 
 
 def destroy_services():
-    """This is a quick way of desroying the services without having to
+    """This is a quick way of destroying the services without having to
     re-bootstrap for the next test. We would just use juju-deployer -T here,
     but https://bugs.launchpad.net/juju-deployer/+bug/1269783 prevents that for
     now."""
@@ -389,6 +389,8 @@
     try:
         subprocess.check_output(args)
     except subprocess.CalledProcessError as e:
+        # FIXME: if check_output raise an exception, we don't get a proper
+        # output to check for the text below -- vila 2014-02-07
         if 'environment is already bootstrapped' not in e.output:
             raise