Merge lp://staging/~doanac/ubuntu-ci-services-itself/ppa-cleaner-integration into lp://staging/ubuntu-ci-services-itself

Proposed by Andy Doan
Status: Merged
Approved by: Chris Johnston
Approved revision: 254
Merged at revision: 255
Proposed branch: lp://staging/~doanac/ubuntu-ci-services-itself/ppa-cleaner-integration
Merge into: lp://staging/ubuntu-ci-services-itself
Prerequisite: lp://staging/~doanac/ubuntu-ci-services-itself/deploy-with-oauth-tokens
Diff against target: 49 lines (+22/-2)
3 files modified
juju-deployer/production-only.yaml (+17/-0)
juju-deployer/update.py (+1/-1)
tarmac.sh (+4/-1)
To merge this branch: bzr merge lp://staging/~doanac/ubuntu-ci-services-itself/ppa-cleaner-integration
Reviewer Review Type Date Requested Status
Chris Johnston (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Andy Doan (community) Approve
Review via email: mp+206312@code.staging.launchpad.net

Commit message

create a production-only deployer for ppa-cleaner

The ppa-cleaner shouldn't be run in cases where we are doing
isolated testing on components through amulet. This moves it
to its own "production" file so we can be more selective.

Description of the change

create a production-only deployer for ppa-cleaner

The ppa-cleaner shouldn't be run in cases where we are doing
isolated testing on components through amulet. This moves it
to its own "production" file so we can be more selective.

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

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

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

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

I want to hold off on this. i'm worried that we might not want the cleaner running by default. This is going to cause amulet testing of the ppa-assigner to clean-up ppa's. This is probably a little more than we want for the ppa-assigner amulet test.

I'm thinking this might need to be moved to its own juju-deployer file so that it only gets deployed when we are doing a full roll-out of the project. More details to follow in email thread

review: Needs Fixing
Revision history for this message
Andy Doan (doanac) wrote :

I think this is ready to be reviewed again.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Chris Johnston (cjohnston) wrote :
Download full text (112.9 KiB)

The attempt to merge lp:~doanac/ubuntu-ci-services-itself/ppa-cleaner-integration into lp:ubuntu-ci-services-itself failed. Below is the output from the failed tests.

New python executable in /tmp/tmp.3f9OSatHga/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.3f9OSatHga/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.3f9OSatHga/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.3f9OSatHga/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 d...

253. By Andy Doan

make pinned-revno testing output something

my MP failure was hard to debug because tarmac.sh didn't print
anything and update.py didn't. This adds some output so users
can see what is broke.

254. By Andy Doan

pin down the new production.yaml revnos

Revision history for this message
Chris Johnston (cjohnston) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches