From: iberezovskiy <iberezovskiy@mirantis.com>
Date: Thu, 28 May 2015 16:53:38 +0000 (+0300)
Subject: Fix names for Oslo libraries
X-Git-Tag: mos-9.0~16
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F69%2F7169%2F6;p=openstack-build%2Fceilometer-build.git

Fix names for Oslo libraries

  We should use dots instead of dashes in
  python-oslo* libraries names
  Remove unit tests

  Related-bug: #1459494
  Related-bug: #1461467

Change-Id: I4b72cebe9de4ab17cdbf33cc31bc4e54c859fcab
---

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 8768942..06bdcc7 100644
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,12 @@
+ceilometer (2015.1.0-1~u14.04+mos2) mos7.0; urgency=medium
+
+  * Fix names for Oslo libraries (use dots instead of dashes)
+    Related-bug: #1459494
+  * Remove unit tests from build stage
+  * Remove get-orig-source
+
+ -- Ivan Berezovskiy <iberezovskiy@mirantis.com>  Thu, 28 May 2015 19:52:20 +0300
+
 ceilometer (2015.1.0-1~u14.04+mos1) mos7.0; urgency=medium
 
   * Build ceilometer 2015.1.0 (stable/kilo)
diff --git a/trusty/debian/control b/trusty/debian/control
index 5fed467..36cbc4f 100644
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -26,17 +26,17 @@ Build-Depends:
  python-neutronclient (>= 1:2.3.11),
  python-nose,
  python-novaclient (>= 1:2.22.0),
- python-oslo-context (>= 0.2.0),
- python-oslo-db (>= 1.7.0),
- python-oslo-concurrency (>= 1.8.0),
- python-oslo-config (>= 1:1.9.3),
- python-oslo-i18n (>= 1.5.0),
- python-oslo-messaging (>= 1.8.0),
- python-oslo-middleware (>= 1.0.0),
- python-oslo-policy (>= 0.3.1),
- python-oslo-rootwrap (>= 1.6.0),
- python-oslo-serialization (>= 1.4.0),
- python-oslo-utils (>= 1.4.0),
+ python-oslo.context (>= 0.2.0),
+ python-oslo.db (>= 1.7.0),
+ python-oslo.concurrency (>= 1.8.0),
+ python-oslo.config (>= 1:1.9.3),
+ python-oslo.i18n (>= 1.5.0),
+ python-oslo.messaging (>= 1.8.0),
+ python-oslo.middleware (>= 1.0.0),
+ python-oslo.policy (>= 0.3.1),
+ python-oslo.rootwrap (>= 1.6.0),
+ python-oslo.serialization (>= 1.4.0),
+ python-oslo.utils (>= 1.4.0),
  python-pastedeploy (>= 1.5.0),
  python-posix-ipc,
  python-pbr (>= 0.10),
@@ -80,17 +80,17 @@ Depends:
  python-migrate (>= 0.9.5),
  python-neutronclient (>= 1:2.3.11),
  python-novaclient (>= 1:2.22.0),
- python-oslo-context (>= 0.2.0),
- python-oslo-db (>= 1.7.0),
- python-oslo-concurrency (>= 1.8.0),
- python-oslo-config (>= 1:1.9.3),
- python-oslo-i18n (>= 1.5.0),
- python-oslo-messaging (>= 1.8.0),
- python-oslo-middleware (>= 1.0.0),
- python-oslo-policy (>= 0.3.1),
- python-oslo-rootwrap (>= 1.6.0),
- python-oslo-serialization (>= 1.4.0),
- python-oslo-utils (>= 1.4.0),
+ python-oslo.context (>= 0.2.0),
+ python-oslo.db (>= 1.7.0),
+ python-oslo.concurrency (>= 1.8.0),
+ python-oslo.config (>= 1:1.9.3),
+ python-oslo.i18n (>= 1.5.0),
+ python-oslo.messaging (>= 1.8.0),
+ python-oslo.middleware (>= 1.0.0),
+ python-oslo.policy (>= 0.3.1),
+ python-oslo.rootwrap (>= 1.6.0),
+ python-oslo.serialization (>= 1.4.0),
+ python-oslo.utils (>= 1.4.0),
  python-pastedeploy (>= 1.5.0),
  python-posix-ipc,
  python-pbr (>= 0.10),
diff --git a/trusty/debian/pydist-overrides b/trusty/debian/pydist-overrides
index 0efd297..b473f55 100644
--- a/trusty/debian/pydist-overrides
+++ b/trusty/debian/pydist-overrides
@@ -1,15 +1,2 @@
 pymongo python-pymongo
 pysnmp
-oslo.context python-oslo-context
-oslo.concurrency python-oslo-concurrency
-oslo.config python-oslo-config
-oslo.messaging python-oslo-messaging
-oslo.vmware python-oslo-vmware
-oslo.utils python-oslo-utils
-oslo.serialization python-oslo-serialization
-oslo.db python-oslo-db
-oslo.i18n python-oslo-i18n
-oslo.utils python-oslo-utils
-oslo.rootwrap python-oslo-rootwrap
-oslo.log python-oslo-log
-oslo.middleware python-oslo-middleware
diff --git a/trusty/debian/rules b/trusty/debian/rules
index a6047da..e13a2db 100755
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -10,19 +10,6 @@ include /usr/share/openstack-pkg-tools/pkgos.make
 %:
 	dh $@  --with python2,systemd
 
-get-orig-source:
-	uscan --verbose --force-download --rename --destdir=../build-area
-
-ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
-override_dh_auto_test:
-	rm -rf .testrepository
-	testr init && \
-	set -e && \
-		TEMP_REZ=`mktemp -t` && \
-			testr run --subunit 'tests\.(?!.*test_bin.*)(?!.*test_gabbi.*)' | tee $$TEMP_REZ | subunit2pyunit; \
-	rm -f $$TEMP_REZ
-endif
-
 override_dh_install:
 	oslo-config-generator --output-file etc/ceilometer/ceilometer.conf.sample \
 	    --namespace ceilometer \