Merge into trunk : js-underscores-1283008 : Code : Ubuntu CI Services

Status:

Merged

Approved by:

Chris Johnston on 2014-02-24

Approved revision:

261

Merged at revision:

265

Proposed branch:

lp:~cjohnston/ubuntu-ci-services-itself/js-underscores-1283008

Merge into:

lp:ubuntu-ci-services-itself

Diff against target:

15 lines (+2/-2)

1 file modified

webui/webui.js (+2/-2)

To merge this branch:

bzr merge lp:~cjohnston/ubuntu-ci-services-itself/js-underscores-1283008

Low

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Evan (community)		2014-02-21	Approve on 2014-02-23
PS Jenkins bot (community)	continuous-integration		Approve on 2014-02-21
Review via email: mp+207724@code.launchpad.net

Commit message

Remove "_" from key names in WebUI

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-21:

#

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

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

review: Approve (continuous-integration)

Revision history for this message

Evan (ev) wrote on 2014-02-23:

#

While not the most elegant looking thing in the world, this appears to be the common approach in Javascript land. +1.

review: Approve

Revision history for this message

Chris Johnston (cjohnston) wrote on 2014-02-23:

#

Download full text (14.5 KiB)

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

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

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

New python executable in /tmp/tmp.SLUiPlLeH5/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.SLUiPlLeH5/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.SLUiPlLeH5/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.SLUiPlLeH5/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 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
Downloading/unpacking PrettyTable>=0.6,<0.8 (from python-glanceclient==0.12.0)
  Downloading prettytable-0.7.2.tar.bz2
  Running setup.py egg_info for package PrettyTable
    
Downloading/unpacking python-keystoneclient>=0.3.0 (from python-glanceclient==0.12.0)
  Running setup.py egg_info for package python-keystoneclient
    
    Installed /tmp/tmp.SLUiPlLeH5/build/python-keystoneclient/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 files found matching 'HACKING'
    warning: no files found matching '*' under directory 'tests'
Downloading/unpacking pyOpenSSL (from python-glanceclient==0.12.0)
  Running setup.py egg_info for package pyOpenSSL
    
    warning: no previously-included files matching '*.pyc' found anywhere in distribution
    no previously-included directories found matching 'doc/_build'
Downloading/unpacking warlock>=1.0.1,<2 (from python-glanceclient==0.12.0)
  Downloading warlock-1.1.0.tar.gz
  Running setup.py egg_info for package warlock
    
Requirement already satisfied (use --upgrade to upgrade): pip>=1.0 in /tmp/tmp.SLUiPlLeH5/lib/python2.7/site-packages/pip-1.1-py2.7.egg (from pbr>=0.5.21,<1.0->python-glanceclient==0.12.0)
Downloading/unpacking Babel>=1.3 (from python-keystoneclient>=0.3.0->python-glanceclient==0.12.0)
  Running setup.py egg_info for package 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'
Downloading/unpacking iso8601>=0.1.8 (from python-keystoneclient>=0.3.0->python-glanceclient==0.12.0)
  Downloading iso8601-0.1.8.tar.gz
  Running setup.py egg_info for package iso8601
    
Downloading/unpacking netaddr>=0.7.6 (from python-keystoneclient>=0.3.0->python-glanceclient==0.12.0)
  Running setup.py egg_info for package netaddr
    
    warning: no previously-included files matching '*.svn*' found anywhere in distribution
    warning: no previously-included files matching '*.git*' found anywhere in distribution
Downloading/unpacking oslo.config>=1.2.0 (from python-keystoneclient>=0.3.0->python-glanceclient==0.12.0)
  Running setup.py egg_info for package oslo.config
    
    Installed /tmp/tmp.SLUiPlLeH5/build/oslo.config/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 files found matching '*' under directory 'tools'
    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
Downloading/unpacking requests>=1.1 (from python-keystoneclient>=0.3.0->python-glanceclient==0.12.0)
  Running setup.py egg_info for package requests
    
Downloading/unpacking six>=1.4.1 (from python-keystoneclient>=0.3.0->python-glanceclient==0.12.0)
  Downloading six-1.5.2.tar.gz
  Running setup.py egg_info for package six
    
    no previously-included directories found matching 'documentation/_build'
Downloading/unpacking cryptography>=0.2.1 (from pyOpenSSL->python-glanceclient==0.12.0)
  Running setup.py egg_info for package cryptography
    no previously-included directories found matching 'documentation/_build'
    zip_safe flag not set; analyzing archive contents...
    six: module references __file__
    
    Installed /tmp/tmp.SLUiPlLeH5/build/cryptography/six-1.5.2-py2.7.egg
    Searching for cffi>=0.8
    Reading http://pypi.python.org/simple/cffi/
    Best match: cffi 0.8.1
    Downloading https://pypi.python.org/packages/source/c/cffi/cffi-0.8.1.tar.gz#md5=1a877bf113bfe90fdefedbf9e39310d2
    Processing cffi-0.8.1.tar.gz
    Running cffi-0.8.1/setup.py -q bdist_egg --dist-dir /tmp/easy_install-qVaolr/cffi-0.8.1/egg-dist-tmp-kpkjOm
    cc -c c/check__thread.c -o c/check__thread.o
    c/_cffi_backend.c:14:17: fatal error: ffi.h: No such file or directory
    compilation terminated.
    Traceback (most recent call last):
      File "<string>", line 14, in <module>
      File "/tmp/tmp.SLUiPlLeH5/build/cryptography/setup.py", line 113, in <module>
        "build": cffi_build,
      File "/usr/lib/python2.7/distutils/core.py", line 112, in setup
        _setup_distribution = dist = klass(attrs)
      File "/tmp/tmp.SLUiPlLeH5/local/lib/python2.7/site-packages/distribute-0.6.24-py2.7.egg/setuptools/dist.py", line 221, in __init__
        self.fetch_build_eggs(attrs.pop('setup_requires'))
      File "/tmp/tmp.SLUiPlLeH5/local/lib/python2.7/site-packages/distribute-0.6.24-py2.7.egg/setuptools/dist.py", line 245, in fetch_build_eggs
        parse_requirements(requires), installer=self.fetch_build_egg
      File "/tmp/tmp.SLUiPlLeH5/local/lib/python2.7/site-packages/distribute-0.6.24-py2.7.egg/pkg_resources.py", line 576, in resolve
        dist = best[req.key] = env.best_match(req, self, installer)
      File "/tmp/tmp.SLUiPlLeH5/local/lib/python2.7/site-packages/distribute-0.6.24-py2.7.egg/pkg_resources.py", line 821, in best_match
        return self.obtain(req, installer) # try and download/install
      File "/tmp/tmp.SLUiPlLeH5/local/lib/python2.7/site-packages/distribute-0.6.24-py2.7.egg/pkg_resources.py", line 833, in obtain
        return installer(requirement)
      File "/tmp/tmp.SLUiPlLeH5/local/lib/python2.7/site-packages/distribute-0.6.24-py2.7.egg/setuptools/dist.py", line 294, in fetch_build_egg
        return cmd.easy_install(req)
      File "/tmp/tmp.SLUiPlLeH5/local/lib/python2.7/site-packages/distribute-0.6.24-py2.7.egg/setuptools/command/easy_install.py", line 589, in easy_install
        return self.install_item(spec, dist.location, tmpdir, deps)
      File "/tmp/tmp.SLUiPlLeH5/local/lib/python2.7/site-packages/distribute-0.6.24-py2.7.egg/setuptools/command/easy_install.py", line 619, in install_item
        dists = self.install_eggs(spec, download, tmpdir)
      File "/tmp/tmp.SLUiPlLeH5/local/lib/python2.7/site-packages/distribute-0.6.24-py2.7.egg/setuptools/command/easy_install.py", line 809, in install_eggs
        return self.build_and_install(setup_script, setup_base)
      File "/tmp/tmp.SLUiPlLeH5/local/lib/python2.7/site-packages/distribute-0.6.24-py2.7.egg/setuptools/command/easy_install.py", line 1086, in build_and_install
        self.run_setup(setup_script, setup_base, args)
      File "/tmp/tmp.SLUiPlLeH5/local/lib/python2.7/site-packages/distribute-0.6.24-py2.7.egg/setuptools/command/easy_install.py", line 1077, in run_setup
        raise DistutilsError("Setup script exited with %s" % (v.args[0],))
    distutils.errors.DistutilsError: Setup script exited with error: command 'gcc' failed with exit status 1
    Complete output from command python setup.py egg_info:
    no previously-included directories found matching 'documentation/_build'

zip_safe flag not set; analyzing archive contents...

six: module references __file__

Installed /tmp/tmp.SLUiPlLeH5/build/cryptography/six-1.5.2-py2.7.egg

Searching for cffi>=0.8

Reading http://pypi.python.org/simple/cffi/

Best match: cffi 0.8.1

Downloading https://pypi.python.org/packages/source/c/cffi/cffi-0.8.1.tar.gz#md5=1a877bf113bfe90fdefedbf9e39310d2

Processing cffi-0.8.1.tar.gz

Running cffi-0.8.1/setup.py -q bdist_egg --dist-dir /tmp/easy_install-qVaolr/cffi-0.8.1/egg-dist-tmp-kpkjOm

cc -c c/check__thread.c -o c/check__thread.o

c/_cffi_backend.c:14:17: fatal error: ffi.h: No such file or directory

compilation terminated.

Traceback (most recent call last):

File "<string>", line 14, in <module>

File "/tmp/tmp.SLUiPlLeH5/build/cryptography/setup.py", line 113, in <module>

"build": cffi_build,

File "/usr/lib/python2.7/distutils/core.py", line 112, in setup

_setup_distribution = dist = klass(attrs)

File "/tmp/tmp.SLUiPlLeH5/local/lib/python2.7/site-packages/distribute-0.6.24-py2.7.egg/setuptools/dist.py", line 221, in __init__

self.fetch_build_eggs(attrs.pop('setup_requires'))

File "/tmp/tmp.SLUiPlLeH5/local/lib/python2.7/site-packages/distribute-0.6.24-py2.7.egg/setuptools/dist.py", line 245, in fetch_build_eggs

parse_requirements(requires), installer=self.fetch_build_egg

File "/tmp/tmp.SLUiPlLeH5/local/lib/python2.7/site-packages/distribute-0.6.24-py2.7.egg/pkg_resources.py", line 576, in resolve

dist = best[req.key] = env.best_match(req, self, installer)

File "/tmp/tmp.SLUiPlLeH5/local/lib/python2.7/site-packages/distribute-0.6.24-py2.7.egg/pkg_resources.py", line 821, in best_match

return self.obtain(req, installer) # try and download/install

File "/tmp/tmp.SLUiPlLeH5/local/lib/python2.7/site-packages/distribute-0.6.24-py2.7.egg/pkg_resources.py", line 833, in obtain

return installer(requirement)

File "/tmp/tmp.SLUiPlLeH5/local/lib/python2.7/site-packages/distribute-0.6.24-py2.7.egg/setuptools/dist.py", line 294, in fetch_build_egg

return cmd.easy_install(req)

File "/tmp/tmp.SLUiPlLeH5/local/lib/python2.7/site-packages/distribute-0.6.24-py2.7.egg/setuptools/command/easy_install.py", line 589, in easy_install

return self.install_item(spec, dist.location, tmpdir, deps)

File "/tmp/tmp.SLUiPlLeH5/local/lib/python2.7/site-packages/distribute-0.6.24-py2.7.egg/setuptools/command/easy_install.py", line 619, in install_item

dists = self.install_eggs(spec, download, tmpdir)

File "/tmp/tmp.SLUiPlLeH5/local/lib/python2.7/site-packages/distribute-0.6.24-py2.7.egg/setuptools/command/easy_install.py", line 809, in install_eggs

return self.build_and_install(setup_script, setup_base)

File "/tmp/tmp.SLUiPlLeH5/local/lib/python2.7/site-packages/distribute-0.6.24-py2.7.egg/setuptools/command/easy_install.py", line 1086, in build_and_install

self.run_setup(setup_script, setup_base, args)

File "/tmp/tmp.SLUiPlLeH5/local/lib/python2.7/site-packages/distribute-0.6.24-py2.7.egg/setuptools/command/easy_install.py", line 1077, in run_setup

raise DistutilsError("Setup script exited with %s" % (v.args[0],))

distutils.errors.DistutilsError: Setup script exited with error: command 'gcc' failed with exit status 1

----------------------------------------
Command python setup.py egg_info failed with error code 1 in /tmp/tmp.SLUiPlLeH5/build/cryptography
Storing complete log in /home/ubuntu/.pip/pip.log
cleaning up venv...

Traceback (most recent call last):
  File "./ci-utils/setup.py", line 54, in <module>
    subprocess.check_call(['pip', 'install', 'python-glanceclient==0.12.0'])
  File "/usr/lib/python2.7/subprocess.py", line 511, in check_call
    raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['pip', 'install', 'python-glanceclient==0.12.0']' returned non-zero exit status 1

1	=== modified file 'webui/webui.js'
2	--- webui/webui.js 2014-02-17 10:13:29 +0000
3	+++ webui/webui.js 2014-02-21 19:06:44 +0000
4	@@ -211,10 +211,10 @@
5	var span = Y.webui.add_artifacts(data['artifact']);
6	value = span.getHTML();
7	}
8	-
9	+ key = key.replace("_", " ");
10	tr = Y.Node.create('<tr></tr>');
11	table.appendChild(tr);
12	- tr.appendChild(Y.Node.create('<th>' + key + ': </th>'));
13	+ tr.appendChild(Y.Node.create('<th>' + key.charAt(0).toUpperCase() + key.slice(1) + ': </th>'));
14	tr.appendChild(Y.Node.create('<td>' + value + '</td>'));
15	}
16

Ubuntu CI Services

Merge lp:~cjohnston/ubuntu-ci-services-itself/js-underscores-1283008 into lp:ubuntu-ci-services-itself

Commit message

Description of the change

Preview Diff

Subscribers