Accepting request 967145 from filesystems:ceph

OBS-URL: https://build.opensuse.org/request/show/967145
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ceph?expand=0&rev=79
This commit is contained in:
Dominique Leuenberger 2022-04-07 22:26:42 +00:00 committed by Git OBS Bridge
commit f735dc2481
7 changed files with 631 additions and 637 deletions

View File

@ -3,74 +3,47 @@
<sandbox>kvm</sandbox>
<overwrite>
<conditions>
<arch>x86_64</arch>
<package>ceph</package>
</conditions>
<hardware>
<disk>
<size unit="G">52</size>
</disk>
<physicalmemory>
<size unit="G">8</size>
</physicalmemory>
</hardware>
</overwrite>
<!--
2022-03-31 - Tim Serong <tserong@suse.com>
Builds of ceph 16.2.7 on IBS showed the following resource usage (in MB):
ceph aarch64 max disk: 41568 max mem: 13698 (on ibs-centriq-6:3 disk: 65536 mem: 18432)
ceph x86_64 max disk: 41621 max mem: 9852 (on sheep74:2 disk: 51200 mem: 12500)
ceph ppc64le max disk: 42005 max mem: 8754 (on ibs-power9-10:1 disk: 61440 mem: 20480)
ceph s390x max disk: 40698 max mem: 8875 (on s390zl36:1 disk: 51200 mem: 10240)
ceph-test x86_64 max disk: 51760 max mem: 16835 (on sheep94:2 disk: 112640 mem: 16384)
Based on the above (and to hopefully provide a little wiggle room for
the future while at the same time not being too demanding of workers)
I've set the disk constraints to 50GB for ceph and 60GB for ceph-test.
Memory requirements remain at 8GB and 10GB respectively as they were
previously - despite the memory usage shown above, AFAIK we haven't
run out of memory during builds, and this keeps the pool of possible
workers noticeably larger than it would be if we required 16GB.
Note to future hackers: please add comments here to describe any further
changes made. Thank you!
-->
<hardware>
<disk>
<size unit="G">50</size>
</disk>
<physicalmemory>
<size unit="G">8</size>
</physicalmemory>
</hardware>
<overwrite>
<conditions>
<arch>aarch64</arch>
<package>ceph</package>
</conditions>
<hardware>
<disk>
<size unit="G">50</size>
</disk>
<physicalmemory>
<size unit="G">8</size>
</physicalmemory>
</hardware>
</overwrite>
<overwrite>
<conditions>
<arch>ppc64le</arch>
<package>ceph</package>
</conditions>
<hardware>
<disk>
<size unit="G">50</size>
</disk>
<physicalmemory>
<size unit="G">8</size>
</physicalmemory>
</hardware>
</overwrite>
<overwrite>
<conditions>
<arch>s390x</arch>
<package>ceph</package>
</conditions>
<hardware>
<disk>
<size unit="G">42</size>
</disk>
<physicalmemory>
<size unit="G">8</size>
</physicalmemory>
</hardware>
</overwrite>
<overwrite>
<conditions>
<arch>x86_64</arch>
<package>ceph-test</package>
</conditions>
<hardware>
<disk>
<size unit="G">64</size>
<size unit="G">60</size>
</disk>
<physicalmemory>
<size unit="G">10</size>
@ -78,49 +51,4 @@
</hardware>
</overwrite>
<overwrite>
<conditions>
<arch>aarch64</arch>
<package>ceph-test</package>
</conditions>
<hardware>
<disk>
<size unit="G">42</size>
</disk>
<physicalmemory>
<size unit="G">8</size>
</physicalmemory>
</hardware>
</overwrite>
<overwrite>
<conditions>
<arch>ppc64le</arch>
<package>ceph-test</package>
</conditions>
<hardware>
<disk>
<size unit="G">28</size>
</disk>
<physicalmemory>
<size unit="G">8</size>
</physicalmemory>
</hardware>
</overwrite>
<overwrite>
<conditions>
<arch>s390x</arch>
<package>ceph-test</package>
</conditions>
<hardware>
<disk>
<size unit="G">42</size>
</disk>
<physicalmemory>
<size unit="G">8</size>
</physicalmemory>
</hardware>
</overwrite>
</constraints>

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:05ee1afbf3c0e7b5ff32b534a973e0c90cb23c6c500ab5c88a4b3b363525b037
size 128471285

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:65ed0ea886d55dccab0a4f1a6d75e68d9e9c2cefc40e053557a6403421794b36
size 128518298

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Mar 31 17:09:16 UTC 2022 - Stefen Allen <stefen.allen@suse.com>
- Update to v16.2.7-654-gd5a90ff46f0
+ (bsc#1196733) remove build directory during %clean
-------------------------------------------------------------------
Wed Mar 30 17:38:31 UTC 2022 - Stefen Allen <stefen.allen@suse.com>

View File

@ -1,25 +1,24 @@
#
# spec file for package ceph
# spec file for package ceph-test
#
# Copyright (c) 2022 SUSE LLC
# Copyright (C) 2004-2019 The Ceph Project Developers. See COPYING file
# at the top-level directory of this distribution and at
# https://github.com/ceph/ceph/blob/master/COPYING
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon.
#
# This file is under the GNU Lesser General Public License, version 2.1
#
# Please submit bugfixes or comments via http://tracker.ceph.com/
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
#################################################################################
# conditional build section
#
# please read http://rpm.org/user_doc/conditional_builds.html for explanation of
# bcond syntax!
#################################################################################
%bcond_with make_check
%bcond_with zbd
%bcond_with cmake_verbose_logging
@ -124,9 +123,9 @@
#################################################################################
# main package definition
#################################################################################
Name: ceph-test
Version: 16.2.7.652+gf5dc462fdb5
Release: 0%{?dist}
Name: ceph-test
Version: 16.2.7.654+gd5a90ff46f0
Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 2
%endif
@ -135,98 +134,95 @@ Epoch: 2
# undefined
%global _epoch_prefix %{?epoch:%{epoch}:}
Summary: Ceph benchmarks and test tools
License: LGPL-2.1 and LGPL-3.0 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-3-Clause and MIT
Summary: Ceph benchmarks and test tools
License: BSD-3-Clause AND BSL-1.0 AND CC-BY-SA-3.0 AND LGPL-2.1-only AND LGPL-3.0-only AND GPL-2.0-only AND MIT
%if 0%{?suse_version}
Group: System/Filesystems
Group: System/Filesystems
%endif
URL: http://ceph.com/
Source0: %{?_remote_tarball_prefix}ceph-16.2.7-652-gf5dc462fdb5.tar.bz2
URL: http://ceph.com/
Source0: %{?_remote_tarball_prefix}ceph-16.2.7-654-gd5a90ff46f0.tar.bz2
%if 0%{?suse_version}
Source94: ceph-rpmlintrc
Source95: checkin.sh
Source96: pre_checkin.sh
Source97: README-ceph-test.txt
Source98: README-checkin.txt
Source99: README-packaging.txt
Source94: ceph-rpmlintrc
Source95: checkin.sh
Source96: pre_checkin.sh
Source97: README-ceph-test.txt
Source98: README-checkin.txt
Source99: README-packaging.txt
# _insert_obs_source_lines_here
ExclusiveArch: x86_64
ExclusiveArch: x86_64
%endif
#################################################################################
# dependencies that apply across all distro families
#################################################################################
Requires: ceph-common
Requires: xmlstarlet
Requires: jq
Requires: socat
Requires(post): binutils
Requires: ceph-common
Requires: jq
Requires: socat
Requires: xmlstarlet
Requires(post): binutils
%if 0%{with cephfs_java}
BuildRequires: java-devel
BuildRequires: sharutils
BuildRequires: java-devel
BuildRequires: sharutils
%endif
%if 0%{with selinux}
BuildRequires: checkpolicy
BuildRequires: selinux-policy-devel
BuildRequires: checkpolicy
BuildRequires: selinux-policy-devel
%endif
BuildRequires: gperf
BuildRequires: cmake > 3.5
BuildRequires: cryptsetup
BuildRequires: fuse-devel
BuildRequires: cryptsetup
BuildRequires: fuse-devel
BuildRequires: gperf
%if 0%{with seastar}
BuildRequires: gcc-toolset-9-gcc-c++ >= 9.2.1-2.3
BuildRequires: gcc-toolset-9-gcc-c++ >= 9.2.1-2.3
%else
BuildRequires: gcc-c++
BuildRequires: gcc-c++
%endif
%if 0%{with tcmalloc}
# libprofiler did not build on ppc64le until 2.7.90
%if 0%{?fedora} || 0%{?rhel} >= 8
BuildRequires: gperftools-devel >= 2.7.90
BuildRequires: gperftools-devel >= 2.7.90
%endif
%if 0%{?rhel} && 0%{?rhel} < 8
BuildRequires: gperftools-devel >= 2.6.1
BuildRequires: gperftools-devel >= 2.6.1
%endif
%if 0%{?suse_version}
BuildRequires: gperftools-devel >= 2.4
BuildRequires: gperftools-devel >= 2.4
%endif
%endif
BuildRequires: leveldb-devel > 1.2
BuildRequires: libaio-devel
BuildRequires: libblkid-devel >= 2.17
BuildRequires: cryptsetup-devel
BuildRequires: libcurl-devel
BuildRequires: libcap-ng-devel
BuildRequires: fmt-devel >= 5.2.1
BuildRequires: pkgconfig(libudev)
BuildRequires: libnl3-devel
BuildRequires: liboath-devel
BuildRequires: libtool
BuildRequires: libxml2-devel
BuildRequires: make
BuildRequires: ncurses-devel
BuildRequires: libicu-devel
BuildRequires: parted
BuildRequires: patch
BuildRequires: perl
BuildRequires: pkgconfig
BuildRequires: cryptsetup-devel
BuildRequires: fmt-devel >= 5.2.1
BuildRequires: leveldb-devel > 1.2
BuildRequires: libaio-devel
BuildRequires: libblkid-devel >= 2.17
BuildRequires: libcap-ng-devel
BuildRequires: libcurl-devel
BuildRequires: libicu-devel
BuildRequires: libnl3-devel
BuildRequires: liboath-devel
BuildRequires: libtool
BuildRequires: libxml2-devel
BuildRequires: lua-devel
BuildRequires: make
BuildRequires: nasm
BuildRequires: ncurses-devel
BuildRequires: parted
BuildRequires: patch
BuildRequires: perl
BuildRequires: pkgconfig
BuildRequires: procps
BuildRequires: python%{python3_pkgversion}
BuildRequires: python%{python3_pkgversion}-devel
BuildRequires: snappy-devel
BuildRequires: sqlite-devel
BuildRequires: sudo
BuildRequires: pkgconfig(udev)
BuildRequires: util-linux
BuildRequires: valgrind-devel
BuildRequires: which
BuildRequires: xfsprogs
BuildRequires: xfsprogs-devel
BuildRequires: xmlstarlet
BuildRequires: nasm
BuildRequires: lua-devel
BuildRequires: python%{python3_pkgversion}
BuildRequires: python%{python3_pkgversion}-devel
BuildRequires: snappy-devel
BuildRequires: sqlite-devel
BuildRequires: sudo
BuildRequires: util-linux
BuildRequires: valgrind-devel
BuildRequires: which
BuildRequires: xfsprogs
BuildRequires: xfsprogs-devel
BuildRequires: xmlstarlet
BuildRequires: pkgconfig(libudev)
BuildRequires: pkgconfig(udev)
%if 0%{with amqp_endpoint}
BuildRequires: librabbitmq-devel
%endif
@ -238,15 +234,15 @@ BuildRequires: %{luarocks_package_name}
%endif
%if 0%{with make_check}
BuildRequires: jq
BuildRequires: libuuid-devel
BuildRequires: python%{python3_pkgversion}-bcrypt
BuildRequires: python%{python3_pkgversion}-nose
BuildRequires: python%{python3_pkgversion}-pecan
BuildRequires: python%{python3_pkgversion}-requests
BuildRequires: python%{python3_pkgversion}-dateutil
BuildRequires: python%{python3_pkgversion}-coverage
BuildRequires: python%{python3_pkgversion}-pyOpenSSL
BuildRequires: socat
BuildRequires: libuuid-devel
BuildRequires: python%{python3_pkgversion}-bcrypt
BuildRequires: python%{python3_pkgversion}-coverage
BuildRequires: python%{python3_pkgversion}-dateutil
BuildRequires: python%{python3_pkgversion}-nose
BuildRequires: python%{python3_pkgversion}-pecan
BuildRequires: python%{python3_pkgversion}-pyOpenSSL
BuildRequires: python%{python3_pkgversion}-requests
BuildRequires: socat
%endif
%if 0%{with zbd}
BuildRequires: libzbd-devel
@ -278,113 +274,113 @@ BuildRequires: ragel
BuildRequires: systemtap-sdt-devel
BuildRequires: yaml-cpp-devel
%if 0%{?fedora}
BuildRequires: libubsan
BuildRequires: libasan
BuildRequires: libatomic
BuildRequires: libubsan
%endif
%if 0%{?rhel}
BuildRequires: gcc-toolset-9-annobin
BuildRequires: gcc-toolset-9-libubsan-devel
BuildRequires: gcc-toolset-9-libasan-devel
BuildRequires: gcc-toolset-9-libatomic-devel
BuildRequires: gcc-toolset-9-libubsan-devel
%endif
%endif
#################################################################################
# distro-conditional dependencies
#################################################################################
%if 0%{?suse_version}
BuildRequires: systemd-rpm-macros
BuildRequires: pkgconfig(systemd)
BuildRequires: systemd-rpm-macros
%{?systemd_requires}
PreReq: %fillup_prereq
BuildRequires: fdupes
BuildRequires: net-tools
BuildRequires: libbz2-devel
BuildRequires: mozilla-nss-devel
BuildRequires: keyutils-devel
PreReq: %fillup_prereq
BuildRequires: fdupes
BuildRequires: keyutils-devel
BuildRequires: libbz2-devel
BuildRequires: libopenssl-devel
BuildRequires: mozilla-nss-devel
BuildRequires: net-tools
BuildRequires: openldap2-devel
#BuildRequires: krb5
#BuildRequires: krb5-devel
BuildRequires: cunit-devel
BuildRequires: python%{python3_pkgversion}-setuptools
BuildRequires: python%{python3_pkgversion}-Cython
BuildRequires: python%{python3_pkgversion}-PrettyTable
BuildRequires: python%{python3_pkgversion}-Sphinx
BuildRequires: liblz4-devel >= 1.7
BuildRequires: python%{python3_pkgversion}-Cython
BuildRequires: python%{python3_pkgversion}-PrettyTable
BuildRequires: python%{python3_pkgversion}-Sphinx
BuildRequires: python%{python3_pkgversion}-setuptools
BuildRequires: rdma-core-devel
BuildRequires: liblz4-devel >= 1.7
# for prometheus-alerts
BuildRequires: golang-github-prometheus-prometheus
%endif
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: boost-random
BuildRequires: nss-devel
BuildRequires: keyutils-libs-devel
BuildRequires: libibverbs-devel
BuildRequires: keyutils-libs-devel
BuildRequires: libibverbs-devel
BuildRequires: librdmacm-devel
BuildRequires: nss-devel
BuildRequires: openldap-devel
#BuildRequires: krb5-devel
BuildRequires: openssl-devel
BuildRequires: CUnit-devel
BuildRequires: python%{python3_pkgversion}-devel
BuildRequires: python%{python3_pkgversion}-setuptools
BuildRequires: python%{python3_pkgversion}-Cython
BuildRequires: python%{python3_pkgversion}-prettytable
BuildRequires: python%{python3_pkgversion}-sphinx
BuildRequires: lz4-devel >= 1.7
BuildRequires: lz4-devel >= 1.7
BuildRequires: python%{python3_pkgversion}-Cython
BuildRequires: python%{python3_pkgversion}-devel
BuildRequires: python%{python3_pkgversion}-prettytable
BuildRequires: python%{python3_pkgversion}-setuptools
BuildRequires: python%{python3_pkgversion}-sphinx
%endif
# distro-conditional make check dependencies
%if 0%{with make_check}
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: golang-github-prometheus
BuildRequires: jsonnet
BuildRequires: libtool-ltdl-devel
BuildRequires: xmlsec1
BuildRequires: xmlsec1-devel
BuildRequires: golang-github-prometheus
BuildRequires: jsonnet
BuildRequires: libtool-ltdl-devel
BuildRequires: xmlsec1
BuildRequires: xmlsec1-devel
%ifarch x86_64
BuildRequires: xmlsec1-nss
BuildRequires: xmlsec1-nss
%endif
BuildRequires: xmlsec1-openssl
BuildRequires: xmlsec1-openssl-devel
BuildRequires: python%{python3_pkgversion}-cherrypy
BuildRequires: python%{python3_pkgversion}-jwt
BuildRequires: python%{python3_pkgversion}-routes
BuildRequires: python%{python3_pkgversion}-scipy
BuildRequires: python%{python3_pkgversion}-werkzeug
BuildRequires: python%{python3_pkgversion}-pyOpenSSL
BuildRequires: python%{python3_pkgversion}-cherrypy
BuildRequires: python%{python3_pkgversion}-jwt
BuildRequires: python%{python3_pkgversion}-pyOpenSSL
BuildRequires: python%{python3_pkgversion}-routes
BuildRequires: python%{python3_pkgversion}-scipy
BuildRequires: python%{python3_pkgversion}-werkzeug
BuildRequires: xmlsec1-openssl
BuildRequires: xmlsec1-openssl-devel
%endif
%if 0%{?suse_version}
BuildRequires: golang-github-prometheus-prometheus
BuildRequires: jsonnet
BuildRequires: libxmlsec1-1
BuildRequires: libxmlsec1-nss1
BuildRequires: libxmlsec1-openssl1
BuildRequires: python%{python3_pkgversion}-CherryPy
BuildRequires: python%{python3_pkgversion}-PyJWT
BuildRequires: python%{python3_pkgversion}-Routes
BuildRequires: python%{python3_pkgversion}-Werkzeug
BuildRequires: python%{python3_pkgversion}-numpy-devel
BuildRequires: xmlsec1-devel
BuildRequires: xmlsec1-openssl-devel
BuildRequires: golang-github-prometheus-prometheus
BuildRequires: jsonnet
BuildRequires: libxmlsec1-1
BuildRequires: libxmlsec1-nss1
BuildRequires: libxmlsec1-openssl1
BuildRequires: python%{python3_pkgversion}-CherryPy
BuildRequires: python%{python3_pkgversion}-PyJWT
BuildRequires: python%{python3_pkgversion}-Routes
BuildRequires: python%{python3_pkgversion}-Werkzeug
BuildRequires: python%{python3_pkgversion}-numpy-devel
BuildRequires: xmlsec1-devel
BuildRequires: xmlsec1-openssl-devel
%endif
%endif
# lttng and babeltrace for rbd-replay-prep
%if %{with lttng}
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: lttng-ust-devel
BuildRequires: libbabeltrace-devel
BuildRequires: libbabeltrace-devel
BuildRequires: lttng-ust-devel
%endif
%if 0%{?suse_version}
BuildRequires: lttng-ust-devel
BuildRequires: babeltrace-devel
BuildRequires: lttng-ust-devel
%endif
%endif
%if 0%{?suse_version}
BuildRequires: libexpat-devel
BuildRequires: libexpat-devel
%endif
%if 0%{?rhel} || 0%{?fedora}
BuildRequires: expat-devel
BuildRequires: expat-devel
%endif
#hardened-cc1
%if 0%{?fedora} || 0%{?rhel}
@ -585,8 +581,9 @@ This package contains Ceph benchmarks and test tools.
%endif
%if 0%{?suse_version}
%endif
%prep
%autosetup -p1 -n ceph-16.2.7-652-gf5dc462fdb5
%autosetup -p1 -n ceph-16.2.7-654-gd5a90ff46f0
%build
# LTO can be enabled as soon as the following GCC bug is fixed:
@ -732,7 +729,6 @@ cat ./CMakeFiles/CMakeError.log
make "$CEPH_MFLAGS_JOBS"
%if 0%{with make_check}
%check
# run in-tree unittests
@ -740,7 +736,6 @@ cd build
ctest "$CEPH_MFLAGS_JOBS"
%endif
%install
pushd build
make DESTDIR=%{buildroot} install
@ -1106,6 +1101,9 @@ done
%clean
rm -rf %{buildroot}
# built binaries are no longer necessary at this point,
# but are consuming ~17GB of disk in the build environment
rm -rf build
#################################################################################
# files and systemd scriptlets
@ -1263,4 +1261,5 @@ rm -rf %{buildroot}
%endif
%if 0%{?suse_version}
%endif
%changelog

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Mar 31 17:09:16 UTC 2022 - Stefen Allen <stefen.allen@suse.com>
- Update to v16.2.7-654-gd5a90ff46f0
+ (bsc#1196733) remove build directory during %clean
-------------------------------------------------------------------
Wed Mar 30 17:38:31 UTC 2022 - Stefen Allen <stefen.allen@suse.com>

819
ceph.spec

File diff suppressed because it is too large Load Diff