slinabery pushed to openstack-tempest (master). "Drop per release subpackages (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue Mar 24 18:53:43 UTC 2015
slinabery pushed to openstack-tempest (master). "Drop per release subpackages (..more)"
>From 221329db9de8aae7da6f81486d8eeb953d9bdd9e Mon Sep 17 00:00:00 2001
From: Alan Pevec <alan.pevec at redhat.com>
Date: Sun, 22 Mar 2015 21:53:09 +0100
Subject: Drop per release subpackages
Instead, make spec ready for maintaining each release in its branch.
Result is compatible with previous subpackages and will upgrade them
e.g. openstack-tempest-juno-20150319.1.el7.noarch.rpm is the output
with the proposed spec.
Change-Id: I0aba6acfd21027d6f6470653678dc2b7f1f1959d
diff --git a/openstack-tempest.spec b/openstack-tempest.spec
index e66fbea..b48237d 100644
--- a/openstack-tempest.spec
+++ b/openstack-tempest.spec
@@ -1,11 +1,12 @@
+%global timestamp 20150319
+
Name: openstack-tempest
-Version: 20141201
-Release: 1%{?dist}
+Version: juno
+Release: %{timestamp}.1%{?dist}
Summary: OpenStack Integration Test Suite (Tempest)
License: ASL 2.0
Url: https://github.com/redhat-openstack/tempest
-Source0: https://github.com/redhat-openstack/tempest/archive/openstack-tempest-icehouse-%{version}.tar.gz
-Source1: https://github.com/redhat-openstack/tempest/archive/openstack-tempest-juno-%{version}.tar.gz
+Source0: https://github.com/redhat-openstack/tempest/archive/openstack-tempest-%{version}-%{timestamp}.tar.gz
BuildArch: noarch
BuildRequires: fdupes
@@ -15,39 +16,7 @@ BuildRequires: python-distribute
BuildRequires: python-pbr
BuildRequires: python2-devel
-%description
-This is a set of integration tests to be run against a live OpenStack cluster.
-Tempest has batteries of tests for OpenStack API validation, Scenarios, and
-other specific tests useful in validating an OpenStack deployment.
-
-%prep
-%setup -q -D -a 0 -c -n tempest-%{name}-%{version}
-%setup -q -D -a 1 -c -n tempest-%{name}-%{version}
-
-%install
-mkdir -p %{buildroot}%{_datarootdir}/%{name}-icehouse
-pushd tempest-openstack-tempest-icehouse-%{version}
-cp --preserve=mode -r . %{buildroot}%{_datarootdir}/%{name}-icehouse
-popd
-mkdir -p %{buildroot}%{_datarootdir}/%{name}-juno
-pushd tempest-openstack-tempest-juno-%{version}
-cp --preserve=mode -r . %{buildroot}%{_datarootdir}/%{name}-juno
-popd
-
-%build
-
-%package icehouse
-Summary: OpenStack Integration Test Suite (Tempest)
-%if 0%{?rhel} && 0%{?rhel} <= 5
-Requires(pre): pwdutils
-%else
-Requires(pre): shadow-utils
-%endif
-%if 0%{?rhel} && 0%{?rhel} <= 6
Requires: python
-%else
-Requires: python >= 2.6.8
-%endif
Requires: python-anyjson
Requires: python-boto
Requires: python-cinderclient
@@ -75,109 +44,28 @@ Requires: python-testscenarios
Requires: python-testtools
Requires: which
-%description icehouse
+%description
This is a set of integration tests to be run against a live OpenStack cluster.
Tempest has batteries of tests for OpenStack API validation, Scenarios, and
other specific tests useful in validating an OpenStack deployment.
-%files icehouse
-%doc tempest-openstack-tempest-icehouse-%{version}/LICENSE
-%defattr(-,root,root)
-%{_datarootdir}/%{name}-icehouse
-%exclude %{_datarootdir}/%{name}-icehouse/.gitignore
-%exclude %{_datarootdir}/%{name}-icehouse/.gitreview
-%exclude %{_datarootdir}/%{name}-icehouse/.mailmap
-%exclude %{_datarootdir}/%{name}-icehouse/.coveragerc
+%prep
+%setup -q -n tempest-%{name}-%{version}-%{timestamp}
-%package juno
-Summary: OpenStack Integration Test Suite (Tempest)
-%if 0%{?rhel} && 0%{?rhel} <= 5
-Requires(pre): pwdutils
-%else
-Requires(pre): shadow-utils
-%endif
-%if 0%{?rhel} && 0%{?rhel} <= 6
-Requires: python
-%else
-Requires: python >= 2.6.8
-%endif
-Requires: python-anyjson
-Requires: python-boto
-Requires: python-cinderclient
-Requires: python-fixtures
-Requires: python-glanceclient
-Requires: python-heatclient
-Requires: python-ironicclient
-Requires: python-iso8601
-Requires: python-junitxml
-Requires: python-keyring
-Requires: python-keystoneclient
-Requires: python-lxml
-Requires: python-netaddr
-Requires: python-neutronclient
-Requires: python-nose
-Requires: python-novaclient
-Requires: python-oslo-config
-Requires: python-paramiko
-Requires: python-pbr
-Requires: python-saharaclient
-Requires: python-swiftclient
-Requires: python-testrepository
-Requires: python-testresources
-Requires: python-testscenarios
-Requires: python-testtools
-Requires: which
+%install
+mkdir -p %{buildroot}%{_datarootdir}/%{name}-%{version}
+cp --preserve=mode -r . %{buildroot}%{_datarootdir}/%{name}-%{version}
-%description juno
-This is a set of integration tests to be run against a live OpenStack cluster.
-Tempest has batteries of tests for OpenStack API validation, Scenarios, and
-other specific tests useful in validating an OpenStack deployment.
+%build
-%files juno
-%doc tempest-openstack-tempest-juno-%{version}/LICENSE
+%files
+%doc LICENSE
%defattr(-,root,root)
-%{_datarootdir}/%{name}-juno
-%exclude %{_datarootdir}/%{name}-juno/.gitignore
-%exclude %{_datarootdir}/%{name}-juno/.gitreview
-%exclude %{_datarootdir}/%{name}-juno/.mailmap
-%exclude %{_datarootdir}/%{name}-juno/.coveragerc
+%{_datarootdir}/%{name}-%{version}
+%exclude %{_datarootdir}/%{name}-%{version}/.gitignore
+%exclude %{_datarootdir}/%{name}-%{version}/.gitreview
+%exclude %{_datarootdir}/%{name}-%{version}/.mailmap
+%exclude %{_datarootdir}/%{name}-%{version}/.coveragerc
%changelog
-* Mon Dec 01 2014 Steve Linabery <slinaber at redhat.com> - 20141201-1
-- rebase to latest tag
-
-* Thu Nov 06 2014 Steve Linabery <slinaber at redhat.com> - 20141105-3
-- fix perms on tools/configure-tempest-directory
-
-* Thu Nov 06 2014 Steve Linabery <slinaber at redhat.com> - 20141105-2
-- sync w/juno branch, patch tools/configure-tempest-directory
-
-* Wed Nov 05 2014 Steve Linabery <slinaber at redhat.com> - 20141105-1
-- rebase to latest tag
-- add juno subpackage
-
-* Mon Sep 15 2014 Steve Linabery <slinaber at redhat.com> - 20140915-2
-- add runtime dep on package which
-
-* Mon Sep 15 2014 Steve Linabery <slinaber at redhat.com> - 20140915-1
-- rebase to latest upstream tag
-
-* Wed Aug 06 2014 Steve Linabery <slinaber at redhat.com> - 20140805-1
-- rebase to latest tag
-- use relative path to LICENSE
-
-* Tue Aug 05 2014 Steve Linabery <slinaber at redhat.com> - 20140703-4
-- keep .testr.conf
-
-* Mon Aug 04 2014 Steve Linabery <slinaber at redhat.com> - 20140703-3
-- Move Requires into subpackage openstack-tempest-icehouse
-
-* Thu Jul 03 2014 Steve Linabery <slinaber at redhat.com> - 20140703-2
-- relax python version requirement for el6
-
-* Thu Jul 03 2014 Steve Linabery <slinaber at redhat.com> - 20140703-1
-- rebase to latest tag
-
-* Wed Jun 25 2014 Steve Linabery <slinaber at redhat.com> - 20140625-1
-- Initial package.
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/openstack-tempest.git/commit/?h=master&id=221329db9de8aae7da6f81486d8eeb953d9bdd9e
--
You received this message due to your preference settings at
https://apps.fedoraproject.org/notifications//fmnscmcommits.id.fedoraproject.org/email/29390
More information about the scm-commits
mailing list