Rebase to upstream -20141105 tags, add juno subpkg

.gitignore

@@ -1,2 +1,4 @@
 /openstack-tempest-icehouse-20140805.tar.gz
 /openstack-tempest-icehouse-20140915.tar.gz
+/openstack-tempest-icehouse-20141105.tar.gz
+/openstack-tempest-juno-20141105.tar.gz

openstack-tempest.spec

@@ -1,10 +1,11 @@
 Name:           openstack-tempest
-Version:        20140915
-Release:        2%{?dist}
+Version:        20141105
+Release:        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
 BuildArch:      noarch
 
 BuildRequires:  fdupes
@@ -21,12 +22,19 @@ 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)
@@ -72,8 +80,6 @@ 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 icehouse
 %doc tempest-openstack-tempest-icehouse-%{version}/LICENSE
 %defattr(-,root,root)
@@ -84,7 +90,65 @@ other specific tests useful in validating an OpenStack deployment.
 %exclude %{_datarootdir}/%{name}-icehouse/.coveragerc
 
 
+%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
+
+%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.
+
+%files juno
+%doc tempest-openstack-tempest-juno-%{version}/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
+
+
 %changelog
+* Wed Nov 05 2014 Steve Linabery <slinaber@redhat.com> - 20141105-1
+- rebase to latest tag
+- add juno subpackage
+
 * Mon Sep 15 2014 Steve Linabery <slinaber@redhat.com> - 20140915-2
 - add runtime dep on package which
 

sources

@@ -1 +1,2 @@
-ee39998b61c9864da0bc4a0174cedf24  openstack-tempest-icehouse-20140915.tar.gz
+52e209f7e2f1602930ad0944ea638128  openstack-tempest-icehouse-20141105.tar.gz
+bbb49290c3089f6f1b6b6d874d2eb288  openstack-tempest-juno-20141105.tar.gz