Merge lp:~james-page/glance/grizzly-qa-1 into lp:~openstack-ubuntu-testing/glance/grizzly

[James Page]

1) Re-enable build failure on test suite failure

New patch to fixup compatibility with webob - see patch for details

2) start-stop-daemon in upstart configurations

3) Misc housekeeping.

[Chuck Short (zulcss)]

I think the webob patch should go upstream but this looks fine to me for now.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-23 16:10:01 +0000
+++ debian/changelog	2012-11-26 14:01:45 +0000
@@ -1,3 +1,18 @@
+glance (2013.1~g1-0ubuntu2) UNRELEASED; urgency=low
+
+  * Re-enable gating of package build based on unit test success:
+    - d/p/webob_1.1_compat.patch: Misc fixes for changes in behaviour
+      between webob 1.0.8 and 1.1 which cause test failures.
+    - d/rules: Enable build failure on unit testing failure, scope
+      test execution to glance/tests.
+  * Switched upstart configurations to use start-stop-daemon instead of su.
+  * General package tidy:
+    - d/control: Drop glance-client package.
+    - d/control: Drop BD on python-dev-all.
+    - Wrapped and sorted.
+
+ -- James Page <[e-mail]>  Mon, 26 Nov 2012 09:02:51 +0000
+
 glance (2013.1~g1-0ubuntu1) raring; urgency=low
 
   [ Adam Gandelman ]

=== modified file 'debian/control'
--- debian/control	2012-10-12 10:09:43 +0000
+++ debian/control	2012-11-26 14:01:45 +0000
@@ -2,38 +2,38 @@
 Section: net
 Priority: extra
 Maintainer: Ubuntu OpenStack <[e-mail]>
-Build-Depends: debhelper (>= 7.0.50),
+Build-Depends:
+ debhelper (>= 7.0.50),
  python-all (>= 2.6),
- python-all-dev (>= 2.6.6-3~),
  sqlite3
 Build-Depends-Indep:
- python-setuptools,
- python-sphinx,
- python-sqlalchemy-ext | python-sqlalchemy (<< 0.6.3-2),
+ curl,
+ pep8,
+ python-argparse,
+ python-boto,
+ python-crypto,
+ python-dateutil,
+ python-eventlet,
+ python-glanceclient,
+ python-httplib2 (>= 0.6.0),
+ python-iso8601,
+ python-jsonschema,
+ python-keystone,
+ python-kombu,
+ python-migrate,
+ python-mox,
  python-nose,
- python-mox,
- python-webob,
- python-routes,
- python-eventlet,
- python-pastedeploy,
  python-paste,
- python-migrate,
- python-argparse,
- python-httplib2 (>= 0.6.0),
+ python-pastedeploy,
+ python-requests,
+ python-routes,
+ python-setuptools,
+ python-sphinx,
+ python-sqlalchemy-ext | python-sqlalchemy (<< 0.6.3-2),
  python-swift,
- python-boto,
- python-crypto,
- python-kombu,
- python-dateutil,
- python-requests,
- python-keystone,
- python-iso8601,
- python-jsonschema,
  python-swiftclient,
- python-glanceclient,
- python-xattr,
- curl,
- pep8
+ python-webob,
+ python-xattr
 Standards-Version: 3.9.3
 XS-Python-Version: >= 2.6
 Homepage: http://launchpad.net/glance
@@ -43,25 +43,27 @@
 Package: python-glance
 Architecture: all
 Section: python
-Depends: ${python:Depends}, ${misc:Depends},
- python-webob,
- python-pastedeploy,
+Depends:
  python-argparse,
- python-kombu,
+ python-crypto,
+ python-dateutil,
+ python-eventlet,
  python-httplib2,
  python-iso8601,
- python-dateutil,
- python-requests,
+ python-jsonschema,
  python-keystone,
- python-swiftclient,
- python-crypto,
- python-jsonschema,
+ python-kombu,
  python-migrate,
- python-sqlalchemy-ext | python-sqlalchemy (<< 0.6.3-2),
+ python-pastedeploy,
+ python-requests,
  python-routes,
- python-eventlet,
  python-setuptools,
- python-xattr
+ python-sqlalchemy-ext | python-sqlalchemy (<< 0.6.3-2),
+ python-swiftclient,
+ python-webob,
+ python-xattr,
+ ${misc:Depends},
+ ${python:Depends}
 Provides: ${python:Provides}
 XB-Python-Version: ${python:Versions}
 Description: OpenStack Image Registry and Delivery Service - Python library
@@ -75,9 +77,11 @@
 Package: glance
 Architecture: all
 Section: python
-Depends: ${python:Depends}, ${misc:Depends},
+Depends:
  glance-api (= ${source:Version}),
  glance-registry (= ${source:Version}),
+ ${misc:Depends},
+ ${python:Depends}
 Suggests: python-ceph
 Description: OpenStack Image Registry and Delivery Service - Daemons
  The Glance project provides an image registration and discovery service
@@ -85,7 +89,7 @@
  in conjunction by Nova to deliver images from object stores, such as
  OpenStack's Swift service, to Nova's compute nodes.
  .
- This package contains the daemons.
+ This package is a metapackage for all glance daemons.
 
 Package: python-glance-doc
 Architecture: all
@@ -102,9 +106,11 @@
 Package: glance-common
 Architecture: all
 Section: python
-Depends: ${python:Depends}, ${misc:Depends},
+Depends:
+ adduser,
  python-glance (= ${source:Version}),
- adduser
+ ${misc:Depends},
+ ${python:Depends}
 Breaks: glance ( <= 2011.3-0ubuntu4.1 )
 Replaces: glance ( <= 2011.3-0ubuntu4.1  )
 Description: OpenStack Image Registry and Delivery Service - Common
@@ -119,7 +125,7 @@
 Architecture: all
 Section: python
 Replaces: glance (<< 2012.1~e1~20110919.1021-0ubuntu2)
-Depends: ${python:Depends}, ${misc:Depends}, glance-common (= ${source:Version})
+Depends: glance-common (= ${source:Version}), ${misc:Depends}, ${python:Depends}
 Recommends: python-glanceclient
 Description: OpenStack Image Registry and Delivery Service - API
  The Glance project provides an image registration, discovery and
@@ -127,13 +133,13 @@
  they may also be used by Nova to deliver images from object stores, such as
  OpenStack's Swift service, to Nova's compute nodes.
  .
- This package contains the glance api server.
+ This package contains the glance API server.
 
 Package: glance-registry
 Architecture: all
 Section: python
 Replaces: glance (<< 2012.1~e1~20110919.1021-0ubuntu2)
-Depends: ${python:Depends}, ${misc:Depends}, glance-common (= ${source:Version})
+Depends: glance-common (= ${source:Version}), ${misc:Depends}, ${python:Depends}
 Recommends: python-glanceclient
 Description: OpenStack Image Registry and Delivery Service - Registry
  The Glance project provides an image registration, discovery and
@@ -142,16 +148,3 @@
  OpenStack's Swift service, to Nova's compute nodes.
  .
  This package contains the glance registry server.
-
-Package: glance-client
-Architecture: all
-Section: python
-Replaces: glance (<< 2012.1~e1~20110919.1021-0ubuntu2)
-Depends: ${python:Depends}, ${misc:Depends}, glance-common (= ${source:Version})
-Description: OpenStack Image Registry and Delivery Service - client
- The Glance project provides an image registration, discovery and
- delivery service. These services may be used as stand-along services, and
- they may also be used by Nova to deliver images from object stores, such as
- OpenStack's Swift service, to Nova's compute nodes.
- .
- This package contains the glance client.

=== modified file 'debian/copyright'
--- debian/copyright	2011-01-17 10:54:50 +0000
+++ debian/copyright	2012-11-26 14:01:45 +0000
@@ -21,4 +21,3 @@
  .
  On Debian-based systems the full text of the Apache version 2.0 license
  can be found in `/usr/share/common-licenses/Apache-2.0'.
-

=== modified file 'debian/glance-api.glance-api.upstart'
--- debian/glance-api.glance-api.upstart	2012-08-21 23:47:03 +0000
+++ debian/glance-api.glance-api.upstart	2012-11-26 14:01:45 +0000
@@ -2,8 +2,10 @@
 author "Soren Hansen <[e-mail]>"
 
 start on runlevel [2345]
-stop on runlevel [016]
+stop on runlevel [!2345]
 
 respawn
 
-exec su -s /bin/sh -c "exec glance-api" glance
+exec start-stop-daemon --start --chuid glance \
+            --chdir /var/lib/glance --name glance-api \
+            --exec /usr/bin/glance-api

=== modified file 'debian/glance-api.install'
--- debian/glance-api.install	2012-06-20 22:30:47 +0000
+++ debian/glance-api.install	2012-11-26 14:01:45 +0000
@@ -1,11 +1,11 @@
+etc/glance-api-paste.ini etc/glance
+etc/glance-api.conf etc/glance
+etc/glance-cache.conf etc/glance
+etc/glance-scrubber.conf etc/glance
+etc/policy.json etc/glance
 usr/bin/glance-api
+usr/bin/glance-cache-cleaner
 usr/bin/glance-cache-manage
-usr/bin/glance-scrubber
 usr/bin/glance-cache-prefetcher
-usr/bin/glance-cache-cleaner
 usr/bin/glance-cache-pruner
-etc/glance-api.conf etc/glance
-etc/glance-api-paste.ini etc/glance
-etc/glance-cache.conf etc/glance
-etc/glance-scrubber.conf etc/glance
-etc/policy.json etc/glance
+usr/bin/glance-scrubber

=== modified file 'debian/glance-common.install'
--- debian/glance-common.install	2012-03-07 15:18:28 +0000
+++ debian/glance-common.install	2012-11-26 14:01:45 +0000
@@ -1,2 +1,2 @@
+usr/bin/glance-control
 usr/bin/glance-manage
-usr/bin/glance-control

=== modified file 'debian/glance-registry.glance-registry.upstart'
--- debian/glance-registry.glance-registry.upstart	2012-08-21 23:47:03 +0000
+++ debian/glance-registry.glance-registry.upstart	2012-11-26 14:01:45 +0000
@@ -2,8 +2,10 @@
 author "Soren Hansen <[e-mail]>"
 
 start on runlevel [2345]
-stop on runlevel [016]
+stop on runlevel [!2345]
 
 respawn
 
-exec su -s /bin/sh -c "exec glance-registry" glance
+exec start-stop-daemon --start --chuid glance \
+            --chdir /var/lib/glance --name glance-registry \
+            --exec /usr/bin/glance-registry

=== modified file 'debian/glance-registry.install'
--- debian/glance-registry.install	2012-11-12 15:06:58 +0000
+++ debian/glance-registry.install	2012-11-26 14:01:45 +0000
@@ -1,4 +1,4 @@
+etc/glance-registry-paste.ini etc/glance
+etc/glance-registry.conf etc/glance
 usr/bin/glance-registry
 usr/bin/glance-replicator
-etc/glance-registry.conf etc/glance
-etc/glance-registry-paste.ini etc/glance

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-11-14 14:31:42 +0000
+++ debian/patches/series	2012-11-26 14:01:45 +0000
@@ -1,2 +1,3 @@
 sql_conn.patch
 disable-network-for-docs.patch
+webob_1.1_compat.patch

=== added file 'debian/patches/webob_1.1_compat.patch'
--- debian/patches/webob_1.1_compat.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/webob_1.1_compat.patch	2012-11-26 14:01:45 +0000
@@ -0,0 +1,54 @@
+Description: webob 1.1 compatibility fixes.
+ Some behaviour changes between 1.0.8 and 1.1 cause test
+ failures; specifically:
+ .
+  - when app_iter is used for chunked transfers the
+    Content-MD5 header is dropped automatically; this
+    might be a bug in webob but setting the MD5 after
+    providing the iterator fixes the issue for the time
+    being.
+  - LimitedLengthFile is now declared in webob itself and
+    no longer exposes the StringIO it wraps directly.
+ .
+ Upstream openstack still baseline on 1.0.8 so Ubuntu will
+ need to hold this patch until they upgrade.
+Author: James Page <[e-mail]>
+Forwarded: no
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/python-webob/+bug/1083155
+
+--- a/glance/tests/unit/v2/test_image_data_resource.py
++++ b/glance/tests/unit/v2/test_image_data_resource.py
+@@ -135,7 +135,7 @@ class TestImageDataDeserializer(test_uti
+         request.headers['Content-Length'] = 3
+         output = self.deserializer.upload(request)
+         data = output.pop('data')
+-        self.assertEqual(data.getvalue(), 'YYY')
++        self.assertEqual(data.read(), 'YYY')
+         expected = {'size': 3}
+         self.assertEqual(expected, output)
+ 
+@@ -160,7 +160,7 @@ class TestImageDataDeserializer(test_uti
+         request.headers['Content-Length'] = 3
+         output = self.deserializer.upload(request)
+         data = output.pop('data')
+-        self.assertEqual(data.getvalue(), 'YYY')
++        self.assertEqual(data.read(), 'YYY')
+         expected = {'size': 3}
+         self.assertEqual(expected, output)
+ 
+--- a/glance/api/v2/image_data.py
++++ b/glance/api/v2/image_data.py
+@@ -135,10 +135,11 @@ class ResponseSerializer(wsgi.JSONRespon
+         checksum = result['meta']['checksum']
+         response.headers['Content-Length'] = size
+         response.headers['Content-Type'] = 'application/octet-stream'
+-        if checksum:
+-            response.headers['Content-MD5'] = checksum
+         response.app_iter = common.size_checked_iter(
+                 response, result['meta'], size, result['data'], self.notifier)
++        if checksum:
++            response.headers['Content-MD5'] = checksum
++
+ 
+     def upload(self, response, result):
+         response.status_int = 201

=== modified file 'debian/python-glance.install'
--- debian/python-glance.install	2011-01-17 11:35:10 +0000
+++ debian/python-glance.install	2012-11-26 14:01:45 +0000
@@ -1,2 +1,1 @@
 usr/lib/python*/dist-packages/*
-

=== modified file 'debian/rules'
--- debian/rules	2012-11-14 13:52:46 +0000
+++ debian/rules	2012-11-26 14:01:45 +0000
@@ -14,7 +14,9 @@
 
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
-	bash run_tests.sh -N || true
+	# Scope tests to glance/tests otherwise we get a weird
+	# nose test failure about glance/openstack/common
+	bash run_tests.sh -N glance/tests
 endif
 
 override_dh_auto_build: