Merge lp:~ev/ubuntu-ci-services-itself/swift-payloads-by-default into lp:ubuntu-ci-services-itself

[Evan]

Uploading the code payload to Swift is now the default method.

This branch makes uploading the code payload to Swift the default. This means:

- Anyone who runs deploy.py from a branch with changes gets those changes deployed.
- The Tarmac instance can test the code payload of the branch being merged, not the tip of trunk.

So it strikes me that this should be the default over the branch-based payload (now --branch-payload) which supports neither.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[Andy Doan (doanac)]

As I've personally forgotten to include this option more than once, I think this is probably a more usable approach :)

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Chris Johnston (cjohnston)]

The attempt to merge lp:~ev/ubuntu-ci-services-itself/swift-payloads-by-default into lp:ubuntu-ci-services-itself failed. Below is the output from the failed tests.

New python executable in /tmp/tmp.QG4aIVHGev/bin/python
Installing distribute.............................................................................................................................................................................................done.
Installing pip...............done.
== Testing ci-utils ....
Downloading/unpacking python-swiftclient==1.8.0
  Running setup.py egg_info for package python-swiftclient

    Installed /tmp/tmp.QG4aIVHGev/build/python-swiftclient/pbr-0.6-py2.7.egg
    [pbr] Processing SOURCES.txt
    warning: LocalManifestMaker: standard file '-c' not found

    warning: no previously-included files found matching '.gitignore'
    warning: no previously-included files found matching '.gitreview'
    warning: no previously-included files matching '*.pyc' found anywhere in distribution
    warning: no files found matching '*' under directory 'tools'
Downloading/unpacking simplejson>=2.0.9 (from python-swiftclient==1.8.0)
  Running setup.py egg_info for package simplejson

Installing collected packages: python-swiftclient, simplejson
  Running setup.py install for python-swiftclient
    [pbr] Reusing existing SOURCES.txt
    changing mode of build/scripts-2.7/swift from 664 to 775
    changing mode of /tmp/tmp.QG4aIVHGev/bin/swift to 775
  Running setup.py install for simplejson
    building 'simplejson._speedups' extension
    gcc -pthread -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -fPIC -I/usr/include/python2.7 -c simplejson/_speedups.c -o build/temp.linux-x86_64-2.7/simplejson/_speedups.o
    gcc -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions -Wl,-Bsymbolic-functions -Wl,-z,relro build/temp.linux-x86_64-2.7/simplejson/_speedups.o -o build/lib.linux-x86_64-2.7/simplejson/_speedups.so

Successfully installed python-swiftclient simplejson
Cleaning up...
Downloading/unpacking python-glanceclient==0.12.0
  Running setup.py egg_info for package python-glanceclient

    Installed /tmp/tmp.QG4aIVHGev/build/python-glanceclient/pbr-0.6-py2.7.egg
    [pbr] Excluding argparse: Python 2.6 only dependency
    [pbr] Processing SOURCES.txt
    warning: LocalManifestMaker: standard file '-c' not found

    warning: no previously-included files found matching '.gitignore'
    warning: no previously-included files found matching '.gitreview'
    warning: no previously-included files matching '*.pyc' found anywhere in distribution
    warning: no previously-included files found matching '.gitignore'
    warning: no previously-included files found matching '.gitreview'
Downloading/unpacking pbr>=0.5.21,<1.0 (from python-glanceclient==0.12.0)
  Running setup.py egg_info for package pbr
    [pbr] Processing SOURCES.txt
    warning: LocalManifestMaker: standard file '-c' not found

    warning: no previously-included files found matching '.gitignore'
    warning: no previously-included files found matching '.gitreview'
    warning: no previously-included files matching '*.pyc' found anywhere in dis...

=== modified file 'juju-deployer/deploy.py'
--- juju-deployer/deploy.py	2014-02-17 10:13:29 +0000
+++ juju-deployer/deploy.py	2014-02-18 08:13:22 +0000
@@ -183,9 +183,10 @@
 def _get_args(args=None):
     parser = argparse.ArgumentParser(
         description='use juju-deployer to deploy services')
-    parser.add_argument('--swift-payload', action='store_true',
-                        help='''Upload this branch as a tarball to swift and
-                        use it as the code-base rather than bzr branches.''')
+    parser.add_argument('--branch-payload', action='store_true',
+                        help='''Use the current tip of this payload branch for
+                        the code-base rather than a tarball of the current
+                        directory.''')
     parser.add_argument('specific', metavar='<config.yaml>', nargs='*',
                         help='Use a specific list of juju-deployer configs.')
 
@@ -208,7 +209,7 @@
     shutil.copytree(deployer_dir, working_dir)
 
     setup_env()
-    if args.swift_payload:
+    if not args.branch_payload:
         setup_swift()
 
     # Create .yaml files from .yaml.tmpl files.