Merge lp://qastaging/~pwlars/ubuntu-ci-services-itself/no-service-start-on-install into lp://qastaging/ubuntu-ci-services-itself

Proposed by Paul Larson
Status: Merged
Approved by: Andy Doan
Approved revision: 360
Merged at revision: 365
Proposed branch: lp://qastaging/~pwlars/ubuntu-ci-services-itself/no-service-start-on-install
Merge into: lp://qastaging/ubuntu-ci-services-itself
Diff against target: 39 lines (+16/-0)
1 file modified
image-builder/imagebuilder/cloud_image.py (+16/-0)
To merge this branch: bzr merge lp://qastaging/~pwlars/ubuntu-ci-services-itself/no-service-start-on-install
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Andy Doan (community) Approve
Paul Larson Needs Resubmitting
Chris Johnston (community) Needs Fixing
Para Siva (community) Approve
Review via email: mp+210481@code.qastaging.launchpad.net

Commit message

Create a policy file to prevent services from starting (Fixes LP:1289249)

Description of the change

This should fix up https://bugs.launchpad.net/ubuntu-ci-services-itself/+bug/1289249

I'm not in a good position to run a full ticket through with this right now, but I've tested it by adding the same policy file, installing whoopsie, and verifying that whoopsie is prevented from starting.

To post a comment you must log in.
Revision history for this message
Andy Doan (doanac) wrote :

wow -this is great. i'll sleep better tonight.

textwrap.dedent could be nice for stuff like:
8 + policyfile="""\
9 +#!/bin/sh
10 + while true; do
11 + case "$1" in
12 + -*) shift ;;
13 + makedev) exit 0;;
14 + x11-common) exit 0;;
15 + *) exit 101;;
16 + esac
17 +done"""

but i know you are nearing vacation time, so feel free to merge as is if needed.

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

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

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Para Siva (psivaa) wrote :

+1 from me too and a big thanks to Paul for fixing this.

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

The attempt to merge lp:~pwlars/ubuntu-ci-services-itself/no-service-start-on-install into lp:ubuntu-ci-services-itself failed. Below is the output from the failed tests.

New python executable in /tmp/tmp.Qob2X0Fi8X/bin/python
Installing distribute.............................................................................................................................................................................................done.
Installing pip...............done.
== Testing ci-utils ....
Unpacking /tmp/tarmac/branch.yz1G_K/.deps/Babel-1.3.tar.gz
  Running setup.py egg_info for package from file:///tmp/tarmac/branch.yz1G_K/.deps/Babel-1.3.tar.gz

    warning: no previously-included files matching '*' found under directory 'docs/_build'
    warning: no previously-included files matching '*.pyc' found under directory 'tests'
    warning: no previously-included files matching '*.pyo' found under directory 'tests'
Installing collected packages: Babel
  Running setup.py install for Babel

    warning: no previously-included files matching '*' found under directory 'docs/_build'
    warning: no previously-included files matching '*.pyc' found under directory 'tests'
    warning: no previously-included files matching '*.pyo' found under directory 'tests'
    Installing pybabel script to /tmp/tmp.Qob2X0Fi8X/bin
Successfully installed Babel
Cleaning up...
Using saved parent location: bzr+ssh://bazaar.launchpad.net/~canonical-ci-engineering/ubuntu-ci-services-itself/deps/
No revisions or tags to pull.
Unpacking /tmp/tarmac/branch.yz1G_K/.deps/pbr-0.6.tar.gz
  Running setup.py egg_info for package from file:///tmp/tarmac/branch.yz1G_K/.deps/pbr-0.6.tar.gz
    [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'
    warning: no previously-included files matching '*.pyc' found anywhere in distribution
Installing collected packages: pbr
  Running setup.py install for pbr
    [pbr] Reusing existing SOURCES.txt
Successfully installed pbr
Cleaning up...
Using saved parent location: bzr+ssh://bazaar.launchpad.net/~canonical-ci-engineering/ubuntu-ci-services-itself/deps/
No revisions or tags to pull.
Unpacking /tmp/tarmac/branch.yz1G_K/.deps/iso8601-0.1.8.tar.gz
  Running setup.py egg_info for package from file:///tmp/tarmac/branch.yz1G_K/.deps/iso8601-0.1.8.tar.gz

Installing collected packages: iso8601
  Running setup.py install for iso8601

Successfully installed iso8601
Cleaning up...
Using saved parent location: bzr+ssh://bazaar.launchpad.net/~canonical-ci-engineering/ubuntu-ci-services-itself/deps/
No revisions or tags to pull.
Unpacking /tmp/tarmac/branch.yz1G_K/.deps/prettytable-0.7.2.zip
  Running setup.py egg_info for package from file:///tmp/tarmac/branch.yz1G_K/.deps/prettytable-0.7.2.zip

Installing collected pack...

Revision history for this message
Chris Johnston (cjohnston) wrote :

======================================================================
FAIL: test_pep8_conformance (imagebuilder.tests.test_style.TestPep8)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/tmp/tmp.ezOmqKZ5pp/local/lib/python2.7/site-packages/ucitests-0.1.2-py2.7.egg/ucitests/styles.py", line 84, in test_pep8_conformance
    '\n'.join(self.report._msgs))
AssertionError: /home/ubuntu/jenkins/workspace/uci-engine-ci/uci-engine-autolanding/image-builder/imagebuilder/cloud_image.py:170:19: E225 missing whitespace around operator

review: Needs Fixing
360. By Paul Larson

use textwrap

Revision history for this message
Paul Larson (pwlars) wrote :

How's that?

review: Needs Resubmitting
Revision history for this message
Andy Doan (doanac) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

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

review: Approve (continuous-integration)

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