Merge lp:~cjohnston/ubuntu-ci-services-itself/bump-deployer into lp:ubuntu-ci-services-itself

Proposed by Chris Johnston
Status: Merged
Approved by: Evan
Approved revision: 263
Merged at revision: 272
Proposed branch: lp:~cjohnston/ubuntu-ci-services-itself/bump-deployer
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:~cjohnston/ubuntu-ci-services-itself/bump-deployer
Reviewer Review Type Date Requested Status
Chris Johnston (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+207815@code.launchpad.net

Commit message

Update pinned revno for juju-deployer after j-d was fixed today.

Description of the change

I worked today with hazmat to get the issues with juju-deployer fixed. 0.3.4 was released (and is revno 103). Since the issues are fixed, I suggest we bump up to the current release.

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

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

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

review: Approve (continuous-integration)
Revision history for this message
Chris Johnston (cjohnston) wrote :

Verbal +1 from ev

review: Approve
Revision history for this message
Chris Johnston (cjohnston) wrote :
Download full text (26.7 KiB)

The attempt to merge lp:~cjohnston/ubuntu-ci-services-itself/bump-deployer into lp:ubuntu-ci-services-itself failed. Below is the output from the failed tests.

New python executable in /tmp/tmp.9NInK0uObb/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.9NInK0uObb/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.9NInK0uObb/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.9NInK0uObb/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 distribu...

Revision history for this message
Chris Johnston (cjohnston) wrote :
Download full text (26.7 KiB)

The attempt to merge lp:~cjohnston/ubuntu-ci-services-itself/bump-deployer into lp:ubuntu-ci-services-itself failed. Below is the output from the failed tests.

New python executable in /tmp/tmp.J52fyO8rlF/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.J52fyO8rlF/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.J52fyO8rlF/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.J52fyO8rlF/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 distribu...

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-02-22 20:14:17 +0000
3+++ juju-deployer/deploy.py 2014-02-23 01:56:16 +0000
4@@ -134,7 +134,7 @@
5 """Install juju-deployer from bzr. We need juju-deployer from tip to have
6 JUJU_REPOSITORY work properly (r87)."""
7
8- deployer = install('lp:juju-deployer', revno=88)
9+ deployer = install('lp:juju-deployer', revno=103)
10 os.environ['PATH'] = '%s:%s' % (deployer, os.environ['PATH'])
11 deployer_bin = os.path.join(deployer, 'juju-deployer')
12 with open(deployer_bin, 'w') as fp:

Subscribers

People subscribed via source and target branches