82 lines
2.8 KiB
Diff
82 lines
2.8 KiB
Diff
From 0482f8ba06d58a5676e80565cd4af08475e4ab55 Mon Sep 17 00:00:00 2001
|
|
From: Matt Peters <matt.peters@windriver.com>
|
|
Date: Wed, 30 May 2018 13:40:28 -0500
|
|
Subject: [PATCH] tis version and build
|
|
|
|
---
|
|
SPECS/python-os-vif.spec | 24 +++++++++++++-----------
|
|
1 file changed, 13 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/SPECS/python-os-vif.spec b/SPECS/python-os-vif.spec
|
|
index f99c901..fe7f772 100644
|
|
--- a/SPECS/python-os-vif.spec
|
|
+++ b/SPECS/python-os-vif.spec
|
|
@@ -12,7 +12,7 @@
|
|
|
|
Name: python-%{library}
|
|
Version: 1.9.1
|
|
-Release: 1%{?dist}
|
|
+Release: 1.el7%{?_tis_dist}.%{tis_patch_ver}
|
|
Summary: OpenStack os-vif library
|
|
License: ASL 2.0
|
|
URL: http://launchpad.net/%{library}/
|
|
@@ -29,11 +29,11 @@ BuildRequires: python2-devel
|
|
BuildRequires: python2-pbr
|
|
BuildRequires: python2-setuptools
|
|
BuildRequires: git
|
|
-BuildRequires: python2-subunit
|
|
+BuildRequires: python-subunit
|
|
BuildRequires: python2-oslotest
|
|
-BuildRequires: python2-os-testr
|
|
+BuildRequires: python-os-testr
|
|
BuildRequires: python2-pyroute2
|
|
-BuildRequires: python2-testtools
|
|
+BuildRequires: python-testtools
|
|
BuildRequires: python2-oslo-log
|
|
BuildRequires: python2-oslo-concurrency
|
|
BuildRequires: python2-oslo-privsep
|
|
@@ -47,12 +47,14 @@ BuildRequires: python-testrepository
|
|
BuildRequires: python-testscenarios
|
|
%endif
|
|
|
|
+# Downgrade OSLO components to support backport
|
|
+# NOTE: this can be restored after OSLO upgrade
|
|
Requires: python2-pbr >= 2.0.0
|
|
-Requires: python2-oslo-config >= 2:5.1.0
|
|
+Requires: python2-oslo-config >= 2:4.11.0
|
|
Requires: python2-oslo-log >= 3.30.0
|
|
Requires: python2-oslo-i18n >= 3.15.3
|
|
-Requires: python2-oslo-privsep >= 1.23.0
|
|
-Requires: python2-oslo-versionedobjects >= 1.28.0
|
|
+Requires: python2-oslo-privsep >= 1.22.0
|
|
+Requires: python2-oslo-versionedobjects >= 1.26.0
|
|
Requires: python2-pyroute2
|
|
Requires: python2-six >= 1.10.0
|
|
Requires: python2-stevedore >= 1.20.0
|
|
@@ -70,10 +72,10 @@ A library for plugging and unplugging virtual interfaces in OpenStack.
|
|
%package -n python2-%{library}-tests
|
|
Summary: OpenStack os-vif library tests
|
|
Requires: python2-%{library} = %{version}-%{release}
|
|
-Requires: python2-subunit
|
|
+Requires: python-subunit
|
|
Requires: python2-oslotest
|
|
-Requires: python2-os-testr
|
|
-Requires: python2-testtools
|
|
+Requires: python-os-testr
|
|
+Requires: python-testtools
|
|
Requires: python2-oslo-versionedobjects-tests
|
|
%if 0%{?fedora} > 0
|
|
Requires: python2-testrepository
|
|
@@ -188,7 +190,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
|
|
export OS_TEST_PATH='./os_vif/tests/unit'
|
|
export PATH=$PATH:$RPM_BUILD_ROOT/usr/bin
|
|
export PYTHONPATH=$PWD
|
|
-stestr --test-path $OS_TEST_PATH run
|
|
+#stestr --test-path $OS_TEST_PATH run
|
|
%if 0%{?with_python3}
|
|
rm -rf .stestr
|
|
stestr-3 --test-path $OS_TEST_PATH run
|
|
--
|
|
1.8.3.1
|
|
|