Ubuntu CI Services

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

  1. 12897942-sha1-payload
  2. Merge into trunk
Proposed by Vincent Ladeuil
Status: Merged
Approved by: Vincent Ladeuil
Approved revision: 344
Merged at revision: 346
Proposed branch: lp:~vila/ubuntu-ci-services-itself/12897942-sha1-payload
Merge into: lp:ubuntu-ci-services-itself
Diff against target: 12 lines (+1/-1)
1 file modified
juju-deployer/deploy.py (+1/-1)
To merge this branch: bzr merge lp:~vila/ubuntu-ci-services-itself/12897942-sha1-payload
Reviewer Review Type Date Requested Status
Para Siva (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+210174@code.launchpad.net

Commit message

Properly restore --reuse-payload.

Description of the change

/me sighs, half my kingdom for tests to avoid stupid errors like this :-/

Restoring --reuse-payload ignored the function rename breaking trunk, this fixes it.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

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

review: Approve (continuous-integration)
Revision history for this message
Para Siva (psivaa) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'juju-deployer/deploy.py'
2--- juju-deployer/deploy.py 2014-03-10 09:02:52 +0000
3+++ juju-deployer/deploy.py 2014-03-10 10:16:52 +0000
4@@ -343,7 +343,7 @@
5 shutil.copytree(deployer_dir, working_dir)
6
7 if not args.branch_payload and not args.reuse_payload:
8- setup_swift()
9+ upload_payload_to_swift()
10
11 # Create .yaml files from .yaml.tmpl files.
12 populate_templates(deployer_dir, working_dir)

Subscribers

People subscribed via source and target branches