Merge lp:~vila/ubuntu-ci-services-itself/reuse-payload into lp:ubuntu-ci-services-itself

[Vincent Ladeuil]

Avoid uploading the ci-payload again when encountering deployment issues

It often takes several attempts to properly run ./juju-deployer/deploy.py until completion.

A significant portion of the time is spent uploading the payload, this gives a way to avoid it completely.

The long term solution would be to be more specific about what we upload but in the mean time, this addresses my current issue.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:304
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~vila/ubuntu-ci-services-itself/reuse-payload/+merge/209279/+edit-commit-message

http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/283/
Executed test runs:

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

review: Needs Fixing (continuous-integration)

[Andy Doan (doanac)]

THANK YOU!!!!!

I was so frustrated about this issue yesterday. I was about to just comment out that snippet in my local branch. This is much better.

review: Approve

=== modified file 'juju-deployer/deploy.py'
--- juju-deployer/deploy.py	2014-02-28 09:25:47 +0000
+++ juju-deployer/deploy.py	2014-03-04 14:59:02 +0000
@@ -228,6 +228,10 @@
                         help='''Use the current tip of this payload branch for
                         the code-base rather than a tarball of the current
                         directory.''')
+    parser.add_argument('--reuse-payload', action='store_true',
+                        help='''Use the already uploaded payload for
+                        the code-base rather than a tarball of the current
+                        directory. Use at your own risk.''')
     parser.add_argument('specific', metavar='<config.yaml>', nargs='*',
                         help='Use a specific list of juju-deployer configs.')
 
@@ -250,7 +254,7 @@
     working_dir = os.path.join(temp_dir, 'deployer')
     shutil.copytree(deployer_dir, working_dir)
 
-    if not args.branch_payload:
+    if not args.branch_payload and not args.reuse_payload:
         setup_swift()
 
     # Create .yaml files from .yaml.tmpl files.