From c074d1a950d70a239f549359ad089d7196be6846 Mon Sep 17 00:00:00 2001 From: Dmitry Burmistrov Date: Wed, 25 Sep 2013 22:39:28 +0400 Subject: [PATCH] Update DEB-specs to 2013.2 version Change-Id: I14c377c310e3b686adb07f18aec444639efb2991 --- debian/changelog | 124 +++++++++++------- debian/cinder-common.install | 1 + debian/control | 32 +++-- .../patches/avoid_paramiko_vers_depends.patch | 19 +++ .../patches/fix-sqlalchemy-requirements.patch | 15 +++ debian/patches/fix_cinder_dependencies.patch | 11 -- debian/patches/series | 3 +- debian/rules | 10 +- debian/tests/cinder-daemons | 15 +++ debian/tests/cinder-volume | 17 +++ debian/tests/control | 3 + debian/tests/python-cinder | 14 ++ debian/tests/test_import_cinder.py | 4 + 13 files changed, 188 insertions(+), 80 deletions(-) create mode 100644 debian/patches/avoid_paramiko_vers_depends.patch create mode 100644 debian/patches/fix-sqlalchemy-requirements.patch delete mode 100644 debian/patches/fix_cinder_dependencies.patch create mode 100755 debian/tests/cinder-daemons create mode 100755 debian/tests/cinder-volume create mode 100644 debian/tests/control create mode 100755 debian/tests/python-cinder create mode 100644 debian/tests/test_import_cinder.py diff --git a/debian/changelog b/debian/changelog index 95d7b30b5..a451f9117 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,52 +1,78 @@ -cinder (1:2013.1.2-0ubuntu1~cloud0) precise-grizzly; urgency=low - - * New update for the Ubuntu Cloud Archive. - - -- Adam Gandelman Wed, 19 Jun 2013 10:00:19 -0700 - -cinder (1:2013.1.2-0ubuntu1) raring-proposed; urgency=low - - * Resynchronize with stable/grizzly (890dc3fe) (LP: #1188788): - - [46f1e0a] Unable to modify volume-type/QoS on cloned SolidFire volume - LP: 1184235 - - [e7d973c] Creating a Cinder volume from an image ID fails to copy the - image to the volume LP: 1183283 - - [c56d031] Cloned volume is associated with wrong SolidFire account - LP: 1183521 - - [53ffc79] Huawei driver failed to handle mutiple requests in short time - LP: 1162251 - - [839a6a7] cinder volume service keeps retrying even with code exception - LP: 1167841 - - [80784a4] Grizzly upgrade breaks old api v1 router path LP: 1168573 - - -- Adam Gandelman Fri, 07 Jun 2013 13:27:14 -0400 - -cinder (1:2013.1.1-0ubuntu1) raring-proposed; urgency=low - - * Resynchronize with stable/grizzly (a4856c4e) (LP: #1179626): - - [995a310] Can't specify custom backend-name for HP/3par driver - LP: 1175222 - - [319f712] SolidFire driver can't be used with extra-specs as in the past - LP: 1167141 - - [817eac8] 3par driver not synchronize causing duplicate hostname error - LP: 1172503 - - [2e3c1cd] backup-delete removes backup from database LP: 1169943 - - [2f72682] nexenta driver doesn't report volume stats LP: 1166607 - - [6221a0e] ThinLVM driver fails due to get_stats LP: 1166572 - - [93247d2] Deleted snapshots still counting against quota LP: 1173365 - - [6008be0] Multibackend config issue in cinder-volume LP: 1169928 - - [b8de829] glusterfs driver doesn't report volume stats LP: 1164038 - - [59f11c9] reschedule_or_reraise in cinder.volume.manager eats exception on - base LVM driver LP: 1159027 - - [9318ffc] cinder-manage backup list is broken since we switched to uuids - for backups LP: 1164922 - - [ba41b68] Logging configured incorrectly in cinder-all LP: 1161038 - - [2113fe1] sql_connection not marked secret LP: 1160680 - - [e1c153c] Error re-scheduling volume creation LP: 1164857 - - [5521cae] Remove unused tools/rfc.sh - - [fed7c92] backup tests fail due to format errors in messages LP: 1166600 - - -- Adam Gandelman Tue, 14 May 2013 07:49:04 -0700 +cinder (1:2013.2~b2-0ubuntu3~cloud0) precise-havana; urgency=low + + * New upstream release for the Ubuntu Cloud Archive. + + -- Chuck Short Tue, 23 Jul 2013 08:18:43 -0400 + +cinder (1:2013.2~b2-0ubuntu3) saucy; urgency=low + + * debian/patches/fix-sqlalchemy-requirements.patch: Fix requirements for sqlalchemy + 0.8. + + -- Chuck Short Mon, 22 Jul 2013 10:03:52 -0400 + +cinder (1:2013.2~b2-0ubuntu2) saucy; urgency=low + + * d/rules: Disable test parallel execution; causing FTBFS when high + levels of concurrency occur on buildds. + + -- James Page Sun, 21 Jul 2013 10:10:10 +0100 + +cinder (1:2013.2~b2-0ubuntu1) saucy; urgency=low + + [ Chuck Short ] + * debian/patches/avoid_paramiko_vers_depends.patch: Refreshed + * debian/control: Add missing testrepostory. + * debian/rules: Use testr directly. + + [ Adam Gandelman ] + * debian/control: + - Add minimum requirement python-anyjson (>= 0.3.3). + - Add minimum requirement python-keystoneclient (>= 0.2.3). + - Add minimum requirement python-kombu (>= 2.5.12). + + [ James Page ] + * New upstream release. + * d/control: Update VCS fields for new branch locations. + * d/rules: Run unit tests in parallel. + + -- James Page Fri, 19 Jul 2013 14:14:40 +0100 + +cinder (1:2013.2~b1-0ubuntu2) saucy; urgency=low + + [ Chuck Short ] + * debian/patches/avoid_paramiko_vers_depends.patch: Refreshed + + [ Adam Gandelman ] + * debian/control: Bump min. stevedore version >= 0.9. + + [Yolanda Robla] + * debian/tests: Added autopkgtests. + + -- Chuck Short Wed, 19 Jun 2013 12:45:18 -0500 + +cinder (1:2013.2~b1-0ubuntu1) saucy; urgency=low + + [ Chuck Short ] + * New upstream version. + * debian/patches/fix_cinder_dependencies.patch: Dropped. + * debian/control: Bump standards version to 3.9.4. + * debian/control: Add python-pbr and python-d2to1 to build-depends. + * debian/control: Add python-testtools and python-fixtures to build-depends + * debian/rules: Add work around to remove wonky setup.py setup + * debian/cinder-common.install: Add cinder-rpc-zmq-receiver binary. + + [ James Page ] + * debian/control: Drop surplus dependency on python-glance (LP: #1175600). + * debian/control,rules: Drop dependency on pep8, don't run pep8 tests during + package build process (its just way to late). + * debian/control: Drop surplus BD on python-cheetah. + + [ Adam Gandelman ] + * debian/patches/avoid_paramiko_vers_depends.patch: Avoid version + requirement on paramiko. + + -- Chuck Short Fri, 31 May 2013 10:01:03 -0500 cinder (1:2013.1-0ubuntu2) raring; urgency=low diff --git a/debian/cinder-common.install b/debian/cinder-common.install index f14d09e79..3d068db3d 100644 --- a/debian/cinder-common.install +++ b/debian/cinder-common.install @@ -6,3 +6,4 @@ etc/cinder/policy.json etc/cinder etc/cinder/rootwrap.conf etc/cinder usr/bin/cinder-manage usr/bin/cinder-rootwrap +usr/bin/cinder-rpc-zmq-receiver diff --git a/debian/control b/debian/control index bb9e046e2..daf5e9236 100644 --- a/debian/control +++ b/debian/control @@ -4,18 +4,18 @@ Priority: extra Maintainer: Chuck Short Build-Depends: debhelper (>= 8.0.0), python-all (>= 2.6) Build-Depends-Indep: - pep8, python-amqplib, - python-anyjson, - python-cheetah, + python-anyjson (>= 0.3.3), python-coverage, + python-d2to1, python-eventlet, + python-fixtures, python-glanceclient, python-greenlet, python-hp3parclient (>= 1.0.0), python-iso8601, - python-keystoneclient, - python-kombu, + python-keystoneclient (>= 0.2.3), + python-kombu (>= 2.5.12), python-lockfile, python-lxml, python-migrate, @@ -27,41 +27,45 @@ Build-Depends-Indep: python-paramiko, python-paste, python-pastedeploy, + python-pbr, python-routes, python-swiftclient, python-setuptools, python-setuptools-git, python-sphinx, python-sqlalchemy, - python-stevedore (>= 0.8), + python-stevedore (>= 0.9), python-suds, - python-webob -Standards-Version: 3.9.3 + python-testtools, + python-webob, + testrepository +Standards-Version: 3.9.4 Homepage: http://launchpad.net/cinder +Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/cinder/havana/files +Vcs-Bzr: https://code.launchpad.net/~ubuntu-server-dev/cinder/havana +XS-Testsuite: autopkgtest Package: python-cinder Section: python Architecture: all Depends: python-amqplib, - python-anyjson, + python-anyjson (>= 0.3.3), python-eventlet, - python-glance, python-glanceclient, - python-keystoneclient, + python-keystoneclient (>= 1:0.2.3), python-oslo.config, python-greenlet, python-iso8601, - python-kombu, + python-kombu (>= 2.5.12), python-lockfile, python-lxml, python-migrate, - python-mysqldb, python-paramiko, python-paste, python-pastedeploy, python-routes, - python-stevedore (>= 0.8), + python-stevedore (>= 0.9), python-swiftclient, python-sqlalchemy, python-suds, diff --git a/debian/patches/avoid_paramiko_vers_depends.patch b/debian/patches/avoid_paramiko_vers_depends.patch new file mode 100644 index 000000000..f7fd08653 --- /dev/null +++ b/debian/patches/avoid_paramiko_vers_depends.patch @@ -0,0 +1,19 @@ +From: Adam Gandelman +Date: Thu May 23 19:12:03 PDT 2013 +Remove version requirements of paramiko dependency until new upstream paramiko +version is packaged. Current version in Saucy (1.7.7.1-3.1ubuntu1) has a +cherry-picked patch to avoid the bug that prompted the version requirement +here. + +diff -Naurp cinder-2013.2.a359.g5be6852.orig/requirements.txt cinder-2013.2.a359.g5be6852/requirements.txt +--- cinder-2013.2.a359.g5be6852.orig/requirements.txt 2013-07-16 11:30:02.000000000 -0400 ++++ cinder-2013.2.a359.g5be6852/requirements.txt 2013-07-16 11:34:18.769962552 -0400 +@@ -11,7 +11,7 @@ lockfile>=0.8 + lxml>=2.3 + netaddr + oslo.config>=1.1.0 +-paramiko>=1.8.0 ++paramiko + Paste + PasteDeploy>=1.5.0 + python-glanceclient>=0.9.0 diff --git a/debian/patches/fix-sqlalchemy-requirements.patch b/debian/patches/fix-sqlalchemy-requirements.patch new file mode 100644 index 000000000..81c2ec773 --- /dev/null +++ b/debian/patches/fix-sqlalchemy-requirements.patch @@ -0,0 +1,15 @@ +Description: Bump sqlalchemy to support 0.8. +Author: Chuck Short +Forwarded: No +diff -Naurp cinder-2013.2.b2.orig/requirements.txt cinder-2013.2.b2/requirements.txt +--- cinder-2013.2.b2.orig/requirements.txt 2013-07-18 11:49:19.000000000 -0400 ++++ cinder-2013.2.b2/requirements.txt 2013-07-22 08:05:15.282522549 -0400 +@@ -20,7 +20,7 @@ python-novaclient>=2.12.0 + python-swiftclient>=1.5 + Routes>=1.12.3 + six +-SQLAlchemy>=0.7.8,<=0.7.99 ++sqlalchemy>=0.7,<=0.8.99 + sqlalchemy-migrate>=0.7.2 + stevedore>=0.10 + suds>=0.4 diff --git a/debian/patches/fix_cinder_dependencies.patch b/debian/patches/fix_cinder_dependencies.patch deleted file mode 100644 index cfe6f6fa5..000000000 --- a/debian/patches/fix_cinder_dependencies.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naurp cinder-2013.1.g3.orig/tools/pip-requires cinder-2013.1.g3/tools/pip-requires ---- cinder-2013.1.g3.orig/tools/pip-requires 2013-02-21 16:08:48.000000000 -0600 -+++ cinder-2013.1.g3/tools/pip-requires 2013-02-22 10:38:34.786411293 -0600 -@@ -18,7 +18,6 @@ suds>=0.4 - paramiko - Babel>=0.9.6 - iso8601>=0.1.4 --setuptools_git>=0.4 - python-glanceclient>=0.5.0,<2 - python-keystoneclient>=0.2.0 - python-swiftclient diff --git a/debian/patches/series b/debian/patches/series index 80657209a..9ae05cd38 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ -fix_cinder_dependencies.patch +avoid_paramiko_vers_depends.patch +fix-sqlalchemy-requirements.patch diff --git a/debian/rules b/debian/rules index 3f35e3ccb..d4ef58857 100755 --- a/debian/rules +++ b/debian/rules @@ -3,10 +3,6 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEBVERS ?= $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p') -VERSION ?= $(shell echo '$(DEBVERS)' | sed -e 's/^[[:digit:]]*://' -e 's/[-].*//') -export OSLO_PACKAGE_VERSION=$(VERSION) - %: dh $@ --with python2 @@ -15,7 +11,7 @@ get-orig-source: ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) override_dh_auto_test: - PYTHONPATH=$(CURDIR) bash run_tests.sh -N -v + testr init && testr run endif override_dh_install: @@ -23,3 +19,7 @@ override_dh_install: override_dh_fixperms: dh_fixperms -Xcinder_tgt.conf + +override_dh_clean: + # temporary workaround for d2to1 wonkyness + dh_clean -Xsetup.cfg diff --git a/debian/tests/cinder-daemons b/debian/tests/cinder-daemons new file mode 100755 index 000000000..3e25e52a0 --- /dev/null +++ b/debian/tests/cinder-daemons @@ -0,0 +1,15 @@ +#!/bin/bash +#----------------------- +# Testing cinder-daemons +#----------------------- +set -e +DAEMONS=('cinder-api' 'cinder-scheduler') + +for daemon in "${DAEMONS[@]}"; do + if pidof -x $daemon > /dev/null; then + echo "OK" + else + echo "ERROR: ${daemon} IS NOT RUNNING" + exit 1 + fi +done diff --git a/debian/tests/cinder-volume b/debian/tests/cinder-volume new file mode 100755 index 000000000..aa235d901 --- /dev/null +++ b/debian/tests/cinder-volume @@ -0,0 +1,17 @@ +#!/bin/bash +#---------------------- +# Testing cinder-volume +#---------------------- +set -e +apt-get install -y cinder-volume cinder-backup 2>&1 > /dev/null +DAEMONS=('cinder-volume' 'cinder-backup') + +for daemon in "${DAEMONS[@]}"; do + if pidof -x $daemon > /dev/null; then + echo "OK" + else + echo "ERROR: ${daemon} IS NOT RUNNING" + exit 1 + fi +done +apt-get remove -y cinder-volume cinder-backup 2>&1 > /dev/null diff --git a/debian/tests/control b/debian/tests/control new file mode 100644 index 000000000..d68943b70 --- /dev/null +++ b/debian/tests/control @@ -0,0 +1,3 @@ +Tests: python-cinder cinder-daemons cinder-volume +Depends: python-cinder, cinder-api, cinder-scheduler, lvm2 +Restrictions: needs-root diff --git a/debian/tests/python-cinder b/debian/tests/python-cinder new file mode 100755 index 000000000..cc9cff092 --- /dev/null +++ b/debian/tests/python-cinder @@ -0,0 +1,14 @@ +#!/bin/bash +#------------------------- +# Testing client utilities +#------------------------- +set -e + +result=$(python `dirname $0`/test_import_cinder.py 2>&1) +if [ "$result" ]; then + echo "ERROR: PYTHON-CINDER MODULE CANNOT BE IMPORTED" + exit 1 +else + echo "OK" + exit 0 +fi diff --git a/debian/tests/test_import_cinder.py b/debian/tests/test_import_cinder.py new file mode 100644 index 000000000..720920529 --- /dev/null +++ b/debian/tests/test_import_cinder.py @@ -0,0 +1,4 @@ +try: + import cinder +except ImportError, e: + print "ERROR IMPORTING MODULE" -- 2.45.2