Fix python-oslo-* dependency names

- Replace python-oslo-<lib> with python-oslo.<lib>
- Disable unit tests execution during buiding

Change-Id: I89a0752dc7b50817e871bd18bc0fcb24be908a11
Related-Bug: #1459494

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 24483f1c0b4fa1323cc543d903047c3b4003ebb8..055681206218ba67ad0390c1cb022a089fe36e57 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,11 @@
+neutron-lbaas (1:2015.1.0-1~u14.04+mos2) mos7.0; urgency=medium
+
+  * Fix python-oslo-* naming scheme
+    #LP 1459494
+  * Disable unit tests execution during building
+
+ -- Sergey Kolekonov <skolekonov@mirantis.com>  Thu, 28 May 2015 15:05:54 +0300
+
 neutron-lbaas (1:2015.1.0-1~u14.04+mos1) mos7.0; urgency=medium
 
   * Updated specs for stable/kilo

diff --git a/trusty/debian/control b/trusty/debian/control
index 128d5b9e633709739d7d9542def66fc06d69c304..52c3d80858f926071c96e92af468d3a25559119e 100644 (file)
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -22,13 +22,13 @@ Build-Depends-Indep:
  python-netaddr (>= 0.7.12),
  python-novaclient (>= 1:2.22.0),
  python-openssl (>= 0.11),
- python-oslo-config (>= 1:1.9.3),
- python-oslo-db (>= 1.7.0),
- python-oslo-log (>= 1.0.0),
- python-oslo-messaging (>= 1.8.0),
- python-oslo-rootwrap (>= 1.6.0),
- python-oslo-serialization (>= 1.4.0),
- python-oslo-utils (>= 1.4.0),
+ python-oslo.config (>= 1:1.9.3),
+ python-oslo.db (>= 1.7.0),
+ python-oslo.log (>= 1.0.0),
+ python-oslo.messaging (>= 1.8.0),
+ python-oslo.rootwrap (>= 1.6.0),
+ python-oslo.serialization (>= 1.4.0),
+ python-oslo.utils (>= 1.4.0),
  python-oslotest (>= 1.5.1),
  python-pbr (>= 0.10),
  python-pyasn1,

diff --git a/trusty/debian/rules b/trusty/debian/rules
index c07f42e079a50b597034e6a173de0d5c66a12655..56240be55cd338a9cc465096e6ed6e14f725b406 100755 (executable)
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -15,8 +15,8 @@ include /usr/share/openstack-pkg-tools/pkgos.make
 # neutron_lbaas.tests.unit.common.tls_utils.test_cert_parser.TestTLSParseUtils.test_read_private_key
 # neutron_lbaas.tests.unit.services.loadbalancer.agent.test_agent.TestLbaasService.test_main
 SKIPTEST := (?!.*TestTLSParseUtils.test_read_private_key.*)(?!.*TestLbaasService.test_main.*)
-ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
        rm -rf .testrepository
        testr init && \
        set -e && \