Merge lp://staging/~doanac/ubuntu-ci-services-itself/bug1286232-mimetype into lp://staging/ubuntu-ci-services-itself

Proposed by Andy Doan
Status: Merged
Approved by: Andy Doan
Approved revision: 311
Merged at revision: 311
Proposed branch: lp://staging/~doanac/ubuntu-ci-services-itself/bug1286232-mimetype
Merge into: lp://staging/ubuntu-ci-services-itself
Diff against target: 58 lines (+9/-6)
3 files modified
ci-utils/ci_utils/data_store/__init__.py (+3/-2)
lander/bin/lander_archiver.py (+5/-3)
lander/lander/tests/test_archiver.py (+1/-1)
To merge this branch: bzr merge lp://staging/~doanac/ubuntu-ci-services-itself/bug1286232-mimetype
Reviewer Review Type Date Requested Status
Andy Doan (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Evan (community) Approve
Paul Larson Needs Fixing
Review via email: mp+209330@code.staging.launchpad.net

Commit message

upload .log files with proper mimetype for swift

Currently our .log files are treated by the swift HTTP server
as binary files. This tells it that they are text/plain so that
they can be viewed directly from the browser.

Description of the change

upload .log files with proper mimetype for swift

Currently our .log files are treated by the swift HTTP server
as binary files. This tells it that they are text/plain so that
they can be viewed directly from the browser.

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

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

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Evan (ev) wrote :

41 + jenkins_utils.get_console_log_url(source_url)
42 + 'text/plain')

Looks like you're missing a comma. Otherwise +1.

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

41 + jenkins_utils.get_console_log_url(source_url)
42 + 'text/plain')
I think you're missing something here...

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

On 03/04/2014 02:28 PM, Evan Dandrea wrote:
> Review: Needs Fixing
>
> 41 + jenkins_utils.get_console_log_url(source_url)
> 42 + 'text/plain')
>
> Looks like you're missing a comma. Otherwise +1.
>
doh! that's what happens when trying to sync to/from my cloud node.

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

at least our unit-tests caught the bug :)

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

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

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

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

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

New python executable in /tmp/tmp.SsZM8bAXsu/bin/python
Installing distribute.............................................................................................................................................................................................done.
Installing pip...............done.
== Testing ci-utils ....
Unpacking /tmp/tarmac/branch.WLSWtv/.deps/Babel-1.3.tar.gz
  Running setup.py egg_info for package from file:///tmp/tarmac/branch.WLSWtv/.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.SsZM8bAXsu/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.WLSWtv/.deps/pbr-0.6.tar.gz
  Running setup.py egg_info for package from file:///tmp/tarmac/branch.WLSWtv/.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.WLSWtv/.deps/iso8601-0.1.8.tar.gz
  Running setup.py egg_info for package from file:///tmp/tarmac/branch.WLSWtv/.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.WLSWtv/.deps/prettytable-0.7.2.zip
  Running setup.py egg_info for package from file:///tmp/tarmac/branch.WLSWtv/.deps/prettytable-0.7.2.zip

Installing collected packages: pr...

311. By Andy Doan

fix testcase

store_artifacts takes an optional argument so a lambda won't work.
mocks are better for this anyway.

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

re-approve

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