From: Denis Egorenko <degorenko@mirantis.com>
Date: Mon, 1 Jun 2015 12:42:52 +0000 (+0300)
Subject: Fix python-oslo-* dependency names and remove override_dh_auto_test
X-Git-Tag: mos-9.0~12
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F17%2F7217%2F4;p=openstack-build%2Fheat-build.git

Fix python-oslo-* dependency names and remove override_dh_auto_test

 * Replace python-oslo-* with python-oslo.*
 * Comment out override_dh_auto_test

Related-Bug: #1459494

Change-Id: Id3af56298fcaa82faa0beeafb4d3a22774aba884
---

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 8e455e7f..11af4153 100644
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,10 @@
+heat (2015.1.0-1~u14.04+mos2) mos7.0; urgency=medium
+
+ * Fix python-oslo-* naming scheme (LP: #1459494)
+ * Remove override_dh_auto_test
+
+ -- Denis Egorenko <degorenko@mirantis.com>  Mon, 01 Jun 2015 15:31:59 +0300
+
 heat (2015.1.0-1~u14.04+mos1) mos7.0; urgency=medium
 
   * Update version to 2015.1.0 according to current Kilo tag
diff --git a/trusty/debian/control b/trusty/debian/control
index 8c1c5169..00f46da9 100644
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -37,16 +37,16 @@ Build-Depends-Indep:
  python-netaddr (>= 0.7.12),
  python-neutronclient (>= 1:2.3.11),
  python-novaclient (>= 1:2.22.0),
- python-oslo-concurrency (>= 1.8.0),
- python-oslo-config (>= 1:1.9.3),
- python-oslo-context (>= 0.2.0),
- python-oslo-db (>= 1.7.0),
- python-oslo-i18n (>= 1.5.0),
- python-oslo-log (>= 1.0.0),
- python-oslo-messaging (>= 1.8.0),
- python-oslo-middleware (>= 1.0.0),
- python-oslo-serialization (>= 1.4.0),
- python-oslo-utils (>= 1.4.0),
+ python-oslo.concurrency (>= 1.8.0),
+ python-oslo.config (>= 1:1.9.3),
+ python-oslo.context (>= 0.2.0),
+ python-oslo.db (>= 1.7.0),
+ python-oslo.i18n (>= 1.5.0),
+ python-oslo.log (>= 1.0.0),
+ python-oslo.messaging (>= 1.8.0),
+ python-oslo.middleware (>= 1.0.0),
+ python-oslo.serialization (>= 1.4.0),
+ python-oslo.utils (>= 1.4.0),
  python-oslosphinx (>= 2.5.0),
  python-oslotest (>= 1.5.1),
  python-osprofiler (>= 0.3.0),
@@ -141,17 +141,17 @@ Depends:
  python-netaddr (>= 0.7.12),
  python-neutronclient (>= 1:2.3.11),
  python-novaclient (>= 1:2.22.0),
- python-oslo-concurrency (>= 1.8.0),
- python-oslo-config (>= 1:1.9.3),
- python-oslo-context (>= 0.2.0),
- python-oslo-db (>= 1.7.0),
- python-oslo-i18n (>= 1.5.0),
- python-oslo-log (>= 1.0.0),
- python-oslo-messaging (>= 1.8.0),
- python-oslo-middleware (>= 1.0.0),
- python-oslo-serialization (>= 1.4.0),
- python-oslo-utils (>= 1.4.0),
- python-oslo-versionedobjects (>= 0.1.1),
+ python-oslo.concurrency (>= 1.8.0),
+ python-oslo.config (>= 1:1.9.3),
+ python-oslo.context (>= 0.2.0),
+ python-oslo.db (>= 1.7.0),
+ python-oslo.i18n (>= 1.5.0),
+ python-oslo.log (>= 1.0.0),
+ python-oslo.messaging (>= 1.8.0),
+ python-oslo.middleware (>= 1.0.0),
+ python-oslo.serialization (>= 1.4.0),
+ python-oslo.utils (>= 1.4.0),
+ python-oslo.versionedobjects (>= 0.1.1),
  python-oslosphinx (>= 2.5.0),
  python-osprofiler (>= 0.3.0),
  python-paste,
diff --git a/trusty/debian/pydist-overrides b/trusty/debian/pydist-overrides
deleted file mode 100644
index 15eb1f2a..00000000
--- a/trusty/debian/pydist-overrides
+++ /dev/null
@@ -1,13 +0,0 @@
-oslo.rootwrap python-oslo-rootwrap
-oslo.vmware python-oslo-vmware
-oslo.concurrency python-oslo-concurrency
-oslo.config python-oslo-config
-oslo.context python-oslo-context
-oslo.log python-oslo-log
-oslo.i18n python-oslo-i18n
-oslo.versionedobjects python-oslo-versionedobjects
-oslo.db python-oslo-db
-oslo.serialization python-oslo-serialization
-oslo.middleware python-oslo-middleware
-oslo.utils python-oslo-utils
-oslo.messaging python-oslo-messaging
diff --git a/trusty/debian/rules b/trusty/debian/rules
index 135b978e..3c788871 100755
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -7,15 +7,15 @@ include /usr/share/openstack-pkg-tools/pkgos.make
 %:
 	dh $@ --buildsystem=python_distutils --with python2,systemd
 
-ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
-override_dh_auto_test:
-	rm -rf .testrepository
-	testr init && \
-	set -e && \
-	TEMP_REZ=`mktemp -t` && \
-	testr run --subunit '^(?!heat_integrationtests)' | tee $$TEMP_REZ | subunit2pyunit; \
-	rm -f $$TEMP_REZ
-endif
+#ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
+#override_dh_auto_test:
+#	rm -rf .testrepository
+#	testr init && \
+#	set -e && \
+#	TEMP_REZ=`mktemp -t` && \
+#	testr run --subunit '^(?!heat_integrationtests)' | tee $$TEMP_REZ | subunit2pyunit; \
+#	rm -f $$TEMP_REZ
+#endif
 
 override_dh_clean:
 	dh_clean