Accepting request 417903 from filesystems:ceph:jewel
- _constraints: set disk constraint to 24G (more realistic value) - Add README-ceph-test.txt to explain the ceph/ceph-test spec file split - Update to version 10.2.2+git.1470653938.8b5c353: + ceph.spec.in: remove conditional block around --disable-static + rpm: add udev BuildRequires to provide /usr/lib/udev directory OBS-URL: https://build.opensuse.org/request/show/417903 OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=54
This commit is contained in:
Git OBS Bridge
parent
84998a80b0
commit
9005fcb082
22
README-ceph-test.txt
Normal file
22
README-ceph-test.txt
Normal file
@ -0,0 +1,22 @@
|
||||
Packaging note
|
||||
==============
|
||||
|
||||
The ceph-test.spec file is generated automatically by running pre_checkin.sh
|
||||
|
||||
Originally, the ceph-test RPM was generated by ceph.spec but this excessively
|
||||
bloated the build and caused trouble in Factory/Leap when the ceph package was
|
||||
added to Ring2 because qemu and libvirt depend on it.
|
||||
|
||||
The new ceph.spec file does not build ceph-test. This reduces the HW
|
||||
constraints (less memory, less disk). Ring2 is more-or-less happy.
|
||||
|
||||
The pre_checkin.sh script is run manually every time the package is updated.
|
||||
This generates the ceph-test.spec from ceph.spec. The ceph-test.spec does
|
||||
everything the original ceph.spec used to do (and hence the build constraints
|
||||
are very high), but only generates the ceph-test RPM - everything else is
|
||||
removed at the end of the %install phase.
|
||||
|
||||
The ceph-test package is implemented as a linkpac. Since the ceph-test RPM is
|
||||
required only for teuthology, it doesn't matter so much that only a very few build
|
||||
workers have enough power to build it.
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
</conditions>
|
||||
<hardware>
|
||||
<disk>
|
||||
<size unit="M">19950</size>
|
||||
<size unit="G">24</size>
|
||||
</disk>
|
||||
<memory>
|
||||
<size unit="G">8</size>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<servicedata>
|
||||
<service name="tar_scm">
|
||||
<param name="url">git://github.com/SUSE/ceph.git</param>
|
||||
<param name="changesrevision">b15328cb435130e9a861b3e4df96fff64e5e5f41</param></service>
|
||||
<param name="changesrevision">8b5c3530fb0a0421cdcb46244f4a819bab459312</param></service>
|
||||
</servicedata>
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0d5859f6f7ffe47bdd62f066b0bb98c58e53668dbec5d50b18e94d82bc7564b1
|
||||
size 16503796
|
||||
3
ceph-10.2.2+git.1470653938.8b5c353.tar.bz2
Normal file
3
ceph-10.2.2+git.1470653938.8b5c353.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:187229cd67be54f426ed313c639500bed6b172e43bac2cb8a2cd0bd053e9bedc
|
||||
size 16500952
|
||||
@ -1,3 +1,22 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 8 21:14:18 UTC 2016 - ncutler@suse.com
|
||||
|
||||
- _constraints: reduce disk constraint to 24G
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 8 17:04:00 UTC 2016 - ncutler@suse.com
|
||||
|
||||
- Add README-ceph-test.txt to explain the ceph/ceph-test spec file split
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 08 11:04:04 UTC 2016 - ncutler@suse.com
|
||||
|
||||
- Update to version 10.2.2+git.1470653938.8b5c353:
|
||||
+ ceph.spec.in: remove conditional block around --disable-static
|
||||
+ rpm: add udev BuildRequires to provide /usr/lib/udev directory
|
||||
- _constraints: increase disk space constraint for ceph package to address
|
||||
"No space left on device" build failures in OBS
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 01 16:36:18 UTC 2016 - ncutler@suse.com
|
||||
|
||||
|
||||
@ -58,7 +58,7 @@
|
||||
# common
|
||||
#################################################################################
|
||||
Name: ceph-test
|
||||
Version: 10.2.2+git.1470069142.b15328c
|
||||
Version: 10.2.2+git.1470653938.8b5c353
|
||||
Release: 0
|
||||
Summary: Ceph benchmarks and test tools
|
||||
License: LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and GPL-2.0-with-autoconf-exception and BSD-3-Clause and MIT
|
||||
@ -113,6 +113,7 @@ BuildRequires: python-requests
|
||||
BuildRequires: python-sphinx
|
||||
BuildRequires: python-virtualenv
|
||||
BuildRequires: snappy-devel
|
||||
BuildRequires: udev
|
||||
BuildRequires: util-linux
|
||||
BuildRequires: valgrind-devel
|
||||
BuildRequires: xfsprogs
|
||||
@ -257,9 +258,7 @@ export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/i386/i486/'`
|
||||
--libexecdir=%{_libexecdir} \
|
||||
--localstatedir=%{_localstatedir} \
|
||||
--sysconfdir=%{_sysconfdir} \
|
||||
%if 0%{?is_opensuse}
|
||||
--disable-static \
|
||||
%endif
|
||||
%if 0%{?rhel} && ! 0%{?centos}
|
||||
--enable-subman \
|
||||
%endif
|
||||
|
||||
19
ceph.changes
19
ceph.changes
@ -1,3 +1,22 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 8 21:14:18 UTC 2016 - ncutler@suse.com
|
||||
|
||||
- _constraints: reduce disk constraint to 24G
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 8 17:04:00 UTC 2016 - ncutler@suse.com
|
||||
|
||||
- Add README-ceph-test.txt to explain the ceph/ceph-test spec file split
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 08 11:04:04 UTC 2016 - ncutler@suse.com
|
||||
|
||||
- Update to version 10.2.2+git.1470653938.8b5c353:
|
||||
+ ceph.spec.in: remove conditional block around --disable-static
|
||||
+ rpm: add udev BuildRequires to provide /usr/lib/udev directory
|
||||
- _constraints: increase disk space constraint for ceph package to address
|
||||
"No space left on device" build failures in OBS
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 01 16:36:18 UTC 2016 - ncutler@suse.com
|
||||
|
||||
|
||||
@ -58,7 +58,7 @@
|
||||
# common
|
||||
#################################################################################
|
||||
Name: ceph
|
||||
Version: 10.2.2+git.1470069142.b15328c
|
||||
Version: 10.2.2+git.1470653938.8b5c353
|
||||
Release: 0
|
||||
Summary: User space components of the Ceph file system
|
||||
License: LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and GPL-2.0-with-autoconf-exception and BSD-3-Clause and MIT
|
||||
@ -111,6 +111,7 @@ BuildRequires: python-requests
|
||||
BuildRequires: python-sphinx
|
||||
BuildRequires: python-virtualenv
|
||||
BuildRequires: snappy-devel
|
||||
BuildRequires: udev
|
||||
BuildRequires: util-linux
|
||||
BuildRequires: valgrind-devel
|
||||
BuildRequires: xfsprogs
|
||||
@ -608,9 +609,7 @@ export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/i386/i486/'`
|
||||
--libexecdir=%{_libexecdir} \
|
||||
--localstatedir=%{_localstatedir} \
|
||||
--sysconfdir=%{_sysconfdir} \
|
||||
%if 0%{?is_opensuse}
|
||||
--disable-static \
|
||||
%endif
|
||||
%if 0%{?rhel} && ! 0%{?centos}
|
||||
--enable-subman \
|
||||
%endif
|
||||
@ -870,6 +869,7 @@ DISABLE_RESTART_ON_UPDATE="yes"
|
||||
%{_unitdir}/rbdmap.service
|
||||
%{python_sitelib}/ceph_argparse.py*
|
||||
%{python_sitelib}/ceph_daemon.py*
|
||||
%dir %{_udevrulesdir}
|
||||
%{_udevrulesdir}/50-rbd.rules
|
||||
%attr(3770,ceph,ceph) %dir %{_localstatedir}/log/ceph/
|
||||
%attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/
|
||||
@ -1153,6 +1153,7 @@ fi
|
||||
%{_sbindir}/ceph-disk
|
||||
%{_sbindir}/ceph-disk-udev
|
||||
%{_libexecdir}/ceph/ceph-osd-prestart.sh
|
||||
%dir %{_udevrulesdir}
|
||||
%{_udevrulesdir}/95-ceph-osd.rules
|
||||
%{_mandir}/man8/ceph-clsinfo.8*
|
||||
%{_mandir}/man8/ceph-disk.8*
|
||||
|
||||
Loading…
Reference in New Issue
Block a user