[arch-commits] Commit in ceph/repos/community-testing-x86_64 (26 files)
Thore Bödecker
foxxx0 at archlinux.org
Sat Jan 4 23:17:53 UTC 2020
Date: Saturday, January 4, 2020 @ 23:17:52
Author: foxxx0
Revision: 548520
archrelease: copy trunk to community-testing-x86_64
Added:
ceph/repos/community-testing-x86_64/PKGBUILD
(from rev 548519, ceph/trunk/PKGBUILD)
ceph/repos/community-testing-x86_64/boost-1.67.patch
(from rev 548519, ceph/trunk/boost-1.67.patch)
ceph/repos/community-testing-x86_64/ceph.sysusers
(from rev 548519, ceph/trunk/ceph.sysusers)
ceph/repos/community-testing-x86_64/disable-broken-mgr-dashboard-test.patch
(from rev 548519, ceph/trunk/disable-broken-mgr-dashboard-test.patch)
ceph/repos/community-testing-x86_64/disable-empty-readable.sh-test.patch
(from rev 548519, ceph/trunk/disable-empty-readable.sh-test.patch)
ceph/repos/community-testing-x86_64/exclude-frontend-from-mgr-dashboard-cov.patch
(from rev 548519, ceph/trunk/exclude-frontend-from-mgr-dashboard-cov.patch)
ceph/repos/community-testing-x86_64/fix-ceph_disk-python-interpreter.patch
(from rev 548519, ceph/trunk/fix-ceph_disk-python-interpreter.patch)
ceph/repos/community-testing-x86_64/fix-python2-paths.patch
(from rev 548519, ceph/trunk/fix-python2-paths.patch)
ceph/repos/community-testing-x86_64/fix-tox-test-commands.patch
(from rev 548519, ceph/trunk/fix-tox-test-commands.patch)
ceph/repos/community-testing-x86_64/remove-distro-version-detection.patch
(from rev 548519, ceph/trunk/remove-distro-version-detection.patch)
ceph/repos/community-testing-x86_64/suppress-pylint-warnings.patch
(from rev 548519, ceph/trunk/suppress-pylint-warnings.patch)
ceph/repos/community-testing-x86_64/use-system-zstd-and-fix-zstd-1.4.0-compatbility.patch
(from rev 548519, ceph/trunk/use-system-zstd-and-fix-zstd-1.4.0-compatbility.patch)
ceph/repos/community-testing-x86_64/use-threadsafe-death-tests-objectstore-memstore.patch
(from rev 548519, ceph/trunk/use-threadsafe-death-tests-objectstore-memstore.patch)
Deleted:
ceph/repos/community-testing-x86_64/PKGBUILD
ceph/repos/community-testing-x86_64/boost-1.67.patch
ceph/repos/community-testing-x86_64/ceph.sysusers
ceph/repos/community-testing-x86_64/disable-broken-mgr-dashboard-test.patch
ceph/repos/community-testing-x86_64/disable-empty-readable.sh-test.patch
ceph/repos/community-testing-x86_64/exclude-frontend-from-mgr-dashboard-cov.patch
ceph/repos/community-testing-x86_64/fix-ceph_disk-python-interpreter.patch
ceph/repos/community-testing-x86_64/fix-python2-paths.patch
ceph/repos/community-testing-x86_64/fix-tox-test-commands.patch
ceph/repos/community-testing-x86_64/remove-distro-version-detection.patch
ceph/repos/community-testing-x86_64/suppress-pylint-warnings.patch
ceph/repos/community-testing-x86_64/use-system-zstd-and-fix-zstd-1.4.0-compatbility.patch
ceph/repos/community-testing-x86_64/use-threadsafe-death-tests-objectstore-memstore.patch
-------------------------------------------------------+
PKGBUILD | 609 +++++++---------
boost-1.67.patch | 22
ceph.sysusers | 2
disable-broken-mgr-dashboard-test.patch | 26
disable-empty-readable.sh-test.patch | 12
exclude-frontend-from-mgr-dashboard-cov.patch | 22
fix-ceph_disk-python-interpreter.patch | 16
fix-python2-paths.patch | 104 +-
fix-tox-test-commands.patch | 320 ++++----
remove-distro-version-detection.patch | 20
suppress-pylint-warnings.patch | 46 -
use-system-zstd-and-fix-zstd-1.4.0-compatbility.patch | 70 -
use-threadsafe-death-tests-objectstore-memstore.patch | 20
13 files changed, 644 insertions(+), 645 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-01-04 23:17:40 UTC (rev 548519)
+++ PKGBUILD 2020-01-04 23:17:52 UTC (rev 548520)
@@ -1,305 +0,0 @@
-# Maintainer: Thore Bödecker <foxxx0 at archlinux.org>
-# Contributor: Sébastien "Seblu" Luttringer <seblu at archlinux.org>
-
-pkgbase='ceph'
-pkgname=('ceph' 'ceph-libs' 'ceph-mgr')
-_zstdver=1.4.4
-pkgver=14.2.5
-pkgrel=1
-pkgdesc='Distributed, fault-tolerant storage platform delivering object, block, and file system'
-arch=('x86_64')
-url='https://ceph.com/'
-license=('GPL')
-makedepends=("zstd=${_zstdver}" 'bc' 'boost' 'boost-libs' 'cmake' 'coffeescript'
- 'cpio' 'crypto++' 'cryptsetup' 'cunit' 'curl' 'cython' 'expat'
- 'fcgi' 'fontconfig' 'fuse2' 'gcc' 'gcc-libs' 'git' 'glibc' 'gmock'
- 'gperf' 'gperftools' 'gptfdisk' 'gtest' 'inetutils' 'java-runtime'
- 'jq' 'jre11-openjdk-headless' 'junit' 'keyutils' 'leveldb' 'libaio'
- 'libatomic_ops' 'libcap' 'libcap-ng' 'libcroco' 'libcurl-compat'
- 'libedit' 'libgudev' 'librabbitmq-c' 'libtool' 'libutil-linux'
- 'libuv' 'libxml2' 'lsb-release' 'lz4' 'ncurses'
- 'nss' 'oath-toolkit' 'openssl' 'parted' 'pcre' 'pcre2' 'pkgconf'
- 'procps-ng' 'python-astroid' 'python-attrs' 'python-bcrypt'
- 'python-cheroot' 'python-cherrypy' 'python-coverage'
- 'python-elasticsearch' 'python-flask' 'python-flask-restful'
- 'python-google-api-python-client' 'python-google-auth'
- 'python-google-auth-httplib2' 'python-grpcio' 'python-isort'
- 'python-jinja' 'python-lazy-object-proxy' 'python-mccabe'
-
- 'python-isodate' 'python-defusedxml' 'python-pkgconfig' 'python-lxml' 'python-xmlsec'
-
- 'python-more-itertools' 'python-numpy' 'python-pbr' 'python-pecan'
- 'python-pip' 'python-pluggy' 'python-portend' 'python-prettytable'
- 'python-prometheus_client' 'python-py' 'python-pycparser'
- 'python-pyjwt' 'python-pyopenssl' 'python-pytz' 'python-requests'
- 'python-routes' 'python-scikit-learn' 'python-scipy'
- 'python-setuptools' 'python-six' 'python-sphinx' 'python-tempora'
- 'python-virtualenv' 'python-werkzeug' 'python-wrapt' 'rabbitmq'
- 'sed' 'snappy' 'socat' 'systemd' 'systemd-libs' 'valgrind'
- 'xfsprogs' 'xmlstarlet' 'xxhash' 'yasm' 'zlib' )
-checkdepends=('python-mock' 'python-nose' 'python-pycodestyle' 'python-pylint'
- 'python-pytest' 'python-pytest-cov')
-options=('emptydirs')
-source=("https://download.ceph.com/tarballs/${pkgbase}-${pkgver}.tar.gz"
- 'ceph.sysusers'
- 'remove-distro-version-detection.patch'
- 'disable-empty-readable.sh-test.patch'
- 'use-threadsafe-death-tests-objectstore-memstore.patch'
- 'use-system-zstd-and-fix-zstd-1.4.0-compatbility.patch'
- 'suppress-pylint-warnings.patch'
- 'disable-broken-mgr-dashboard-test.patch'
- "zstd-${_zstdver}.tar.gz::https://github.com/facebook/zstd/archive/v${_zstdver}.tar.gz")
-sha512sums=('38da62a38960d3618e2689f0e882785d4d95358b4a3b3b5b83e54e227cff9e69f4cca0b63d2d55d69e3916055818e6cf9067f2c2eddeb221ef4bc64a13cfa22b'
- '4354001c1abd9a0c385ba7bd529e3638fb6660b6a88d4e49706d4ac21c81b8e829303a20fb5445730bdac18c4865efb10bc809c1cd56d743c12aa9a52e160049'
- '02c9e8fd3c23fb4c9c4c576ee6d06e8525ca31decfd964fb7231e73c98fe2987a483dda680969752186f0918f47d9af4fb09a4901e5319077f45d870906716da'
- '2234d005df71b3b6013e6b76ad07a5791e3af7efec5f41c78eb1a9c92a22a67f0be9560be59b52534e90bfe251bcf32c33d5d40163f3f8f7e7420691f0f4a222'
- 'a74aea7c0b0d1883c874f889c184bd2c766fa578d6ca0cbe5eaada840281bb947b3d80f142b30473058cd2652d2967d241ade6914d6be50e93e91728a31733c8'
- '4345fc2f422c7c1910bfd4068ad39511fa63d8c1e4fc04af416bb0f3869e43327d4a4bfc980d5abf273693a532ac153ed1e4c03e033a127692c1254b99092b8a'
- '4afd5c3b49a839531921e80b1204ef5b496531a31b3de13042bfcbb548d736851ef7698e41bc94a9bed356e7c2cab6bf30bc711796249cf10ee791974033c29b'
- '63a92990f979dadb3c23e04e559d95d52cdb3f79115406900ccae67d3f8b1d0658f05431142365eba6ffb7706f9751209f702b69d6ffcd815716ffaf74ebae54'
- '8209837e8eb14e474dfe21d5511085f46cef93b03ab77613fd41e7b8be652418231c38852669c8e0b55b78ad41ea2cb8008d0da122a83f8f27e32b5c86f045cf')
-
-
-# -fno-plt causes linker errors (undefined reference to internal methods)
-# similar issue: https://bugs.archlinux.org/task/54845
-# https://github.com/intel/media-driver/commit/d95d8f7ab7ac94a2e0f4ee6a4b4794898dc2d3b7
-# as of today (2019-07-12) the upstream maintainers do not consider this a bug in their code
-# (IMHO rightfully so) and thus we strip the option here
-CFLAGS="${CFLAGS/-fno-plt/}"
-CXXFLAGS="${CXXFLAGS/-fno-plt/}"
-
-
-prepare() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
- # apply patches from the source array
- local filename
- for filename in "${source[@]}"; do
- if [[ "${filename}" =~ \.patch$ ]]; then
- msg2 "Applying patch ${filename##*/}"
- patch -p1 -N -i "${srcdir}/${filename##*/}"
- fi
- done
-
- # suppress deprecation warnings
- sed -i '/#ifndef CEPH_CONFIG_H/i#define BOOST_ALLOW_DEPRECATED_HEADERS' \
- src/common/config.h
- sed -i '/#ifndef CEPH_TYPES_H/i#define BOOST_ALLOW_DEPRECATED_HEADERS' \
- src/include/types.h
-
- # remove bundled zstd and replace with newer release
- rm -rf src/zstd
- ln -sf "${srcdir}/zstd-${_zstdver}" src/zstd
-
- # remove tests that require root privileges
- rm src/test/cli/ceph-authtool/cap*.t
-
- # this test will try to perform btrfs operations when a btrfs mount
- # is active on the build host, which will fail
- # if mount | grep 'type btrfs' &>/dev/null; then
- # sed -i '/run-tox-ceph-disk/d' src/test/CMakeLists.txt
- # fi
-}
-
-build() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
- mkdir -p build
- cd build
-
- export PYTHON_INCLUDE_DIR="$(python -c "from sysconfig import get_path; print(get_path('include'))")"
-
- cmake \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_SYSCONFDIR=/etc \
- -DCMAKE_INSTALL_SBINDIR=/usr/bin \
- -DCMAKE_INSTALL_LIBDIR=/usr/lib \
- -DCEPH_SYSTEMD_ENV_DIR=/etc/default \
- -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib \
- -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=/usr/lib/systemd/system \
- -DCMAKE_VERBOSE_MAKEFILE=ON \
- -DCMAKE_BUILD_TYPE=RelWithDebInf \
- -DENABLE_GIT_VERSION=ON \
- -DWITH_PYTHON2=OFF \
- -DWITH_PYTHON3=3 \
- -DMGR_PYTHON_VERSION=3 \
- -DPYTHON_INCLUDE_DIR="${PYTHON_INCLUDE_DIR:?}" \
- -DWITH_BABELTRACE=OFF \
- -DWITH_LTTNG=OFF \
- -DWITH_OPENLDAP=OFF \
- -DWITH_RDMA=OFF \
- -DWITH_TBB=OFF \
- -DWITH_OCF=OFF \
- -DWITH_DPDK=OFF \
- -DWITH_SPDK=OFF \
- -DWITH_CEPHFS=ON \
- -DWITH_CEPHFS_JAVA=ON \
- -DWITH_CEPHFS_SHELL=ON \
- -DWITH_FUSE=ON \
- -DWITH_LZ4=ON \
- -DWITH_XFS=ON \
- -DWITH_NSS=ON \
- -DWITH_NUMA=ON \
- -DWITH_MGR=ON \
- -DWITH_MGR_DASHBOARD_FRONTEND=ON \
- -DWITH_RADOSGW=ON \
- -DWITH_RADOSGW_FCGI_FRONTEND=OFF \
- -DWITH_RADOSGW_BEAST_FRONTEND=ON \
- -DWITH_RADOSGW_BEAST_OPENSSL=ON \
- -DWITH_RADOSGW_AMQP_ENDPOINT=OFF \
- -DWITH_SSL=ON \
- -DWITH_SYSTEMD=ON \
- -DWITH_SYSTEM_BOOST=OFF \
- -DWITH_BOOST_CONTEXT=ON \
- -DWITH_SYSTEM_GTEST=OFF \
- -DWITH_SYSTEM_NPM=OFF \
- -DENABLE_SHARED=ON \
- -DWITH_TESTS=ON \
- ..
-
- VERBOSE=1 make all
-}
-
-check() {
- cd "${srcdir}/${pkgbase}-${pkgver}/build"
-
- export CTEST_PARALLEL_LEVEL="$(nproc)"
- VERBOSE=1 make check
-
- # sometimes processes are not properly terminated...
- for process in ceph-mon ceph-mgr ceph-osd; do
- pkill -9 "${process}" || true
- done
-}
-
-package_ceph-libs() {
- depends=('boost-libs' 'curl' 'glibc' 'keyutils' 'libutil-linux' 'lz4' 'nss'
- 'oath-toolkit' 'python' 'snappy' 'systemd-libs')
-
- cd "${srcdir}/${pkgbase}-${pkgver}/build"
-
- # main install
- VERBOSE=1 make DESTDIR="${pkgdir}" install
-
- # remove stuff that goes into the ceph package
- rm -rf "${pkgdir}"/usr/lib/{ceph/mgr,systemd,sysusers.d,tmpfiles.d}
- rm -rf "${pkgdir}/usr/share"
- rm -rf "${pkgdir}/usr/sbin"
- rm -rf "${pkgdir}/usr/bin"
- rm -rf "${pkgdir}/etc"
- rm -rf "${pkgdir}/var"
-}
-
-package_ceph() {
- depends=("ceph-libs=${pkgver}-${pkgrel}"
- 'boost-libs' 'curl' 'fuse2' 'glibc' 'gperftools' 'java-runtime'
- 'keyutils' 'leveldb' 'libaio' 'libutil-linux' 'lsb-release' 'ncurses'
- 'nss' 'oath-toolkit' 'python' 'python-bcrypt' 'python-setuptools'
- 'snappy' 'systemd-libs' 'xfsprogs')
-
- cd "${srcdir}/${pkgbase}-${pkgver}/build"
-
- # main install
- VERBOSE=1 make DESTDIR="${pkgdir}" install
-
- # fix sbin dir (cmake opt seems to have no effect)
- mv "${pkgdir}"/usr/sbin/* "${pkgdir}/usr/bin/"
- rm -rf "${pkgdir}/usr/sbin"
-
- # remove stuff that is in the ceph-libs package
- find "${pkgdir}/usr/lib" -maxdepth 1 -type f -delete
- find "${pkgdir}/usr/lib" -maxdepth 1 -type l -delete
- find "${pkgdir}/usr/lib/ceph" -maxdepth 1 -type f -delete
- find "${pkgdir}/usr/lib/ceph" -maxdepth 1 -type l -delete
- rm -rf "${pkgdir}"/usr/lib/{ceph/{compressor,crypto,erasure-code},rados-classes}
- rm -rf "${pkgdir}"/usr/lib/python*
- rm -rf "${pkgdir}/usr/include"
-
- # remove stuff that is in the ceph-mgr package
- rm -rf "${pkgdir}"/usr/{bin/ceph-mgr,share/ceph/mgr,lib/systemd/system/ceph-mgr*}
-
- # remove _test_ binaries from the package, not needed
- find "${pkgdir}/usr/bin" -maxdepth 1 -type f -iname 'ceph_test_*' -delete
-
- # install tmpfiles.d and sysusers.d stuff
- install -Dm644 "${srcdir}/${pkgbase}-${pkgver}/systemd/ceph.tmpfiles.d" \
- "${pkgdir}/usr/lib/tmpfiles.d/${pkgbase}.conf"
- install -Dm644 "${srcdir}/ceph.sysusers" \
- "${pkgdir}/usr/lib/sysusers.d/${pkgbase}.conf"
-
- # remove debian init script
- rm -rf "${pkgdir}/etc/init.d"
-
- # remove drop.ceph.com ssh stuff
- rm -f "${pkgdir}"/usr/share/ceph/id_rsa_drop.ceph.com
- rm -f "${pkgdir}"/usr/share/ceph/id_rsa_drop.ceph.com.pub
- rm -f "${pkgdir}"/usr/share/ceph/known_hosts_drop.ceph.com
-
- # fix bash completions path
- install -d -m 755 "${pkgdir}/usr/share/bash-completion"
- mv "${pkgdir}"/{etc/bash_completion.d,usr/share/bash-completion/completions}
-
- # fix EnvironmentFile location in systemd service files
- sed -i 's|/etc/sysconfig/|/etc/conf.d/|g' "${pkgdir}"/usr/lib/systemd/system/*.service
-
- # prepare some paths and set correct permissions
- install -D -d -m750 -o 0 -g 340 "${pkgdir}/etc/ceph"
- install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/log/ceph"
- install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph"
- install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/bootstrap-mds"
- install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/bootstrap-osd"
- install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/bootstrap-rgw"
- install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/mon"
- install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/osd"
-}
-
-package_ceph-mgr() {
- depends=("ceph=${pkgver}-${pkgrel}" "ceph-libs=${pkgver}-${pkgrel}"
- 'bash' 'boost-libs' 'coffeescript' 'curl' 'gperftools' 'nodejs' 'nss'
- 'python' 'python-cherrypy' 'python-flask-restful' 'python-pecan'
- 'python-pyjwt' 'python-routes' 'python-requests' 'python-pyopenssl'
- 'python-prettytable')
- optdepends=('python-influxdb: influx module'
- 'python-kubernetes: rook module'
- 'python-prometheus_client: prometheus module'
- 'python-remoto: ssh module')
- conflicts=('ceph<14.2.1-1')
-
- cd "${srcdir}/${pkgbase}-${pkgver}/build"
-
- # main install
- VERBOSE=1 make DESTDIR="${pkgdir}" install
-
- # fix sbin dir (cmake opt seems to have no effect)
- mv "${pkgdir}"/usr/sbin/* "${pkgdir}/usr/bin/"
- rm -rf "${pkgdir}/usr/sbin"
-
- # remove everything except mgr related stuff, rest is in ceph/ceph-libs
- rm -rf "${pkgdir}"/usr/lib/{ceph/{compressor,crypto,erasure-code},rados-classes}
- rm -rf "${pkgdir}/usr/include"
- find "${pkgdir}/usr/bin" -maxdepth 1 -type f -not -name 'ceph-mgr' -delete
- find "${pkgdir}"/usr/lib/systemd/system -maxdepth 1 -type f -not -iname 'ceph-mgr*' -delete
- find "${pkgdir}"/usr/lib -maxdepth 1 -type f -delete
- find "${pkgdir}"/usr/lib -maxdepth 1 -type l -delete
- rm -rf "${pkgdir}"/etc
- rm -rf "${pkgdir}"/var
- rm -rf "${pkgdir}"/usr/lib/{ceph,sysusers.d,tmpfiles.d}
- rm -rf "${pkgdir}"/usr/lib/python*
- rm -rf "${pkgdir}"/usr/share/{bash-completion,doc,java,man}
-
- # remove debian init script
- rm -rf "${pkgdir}/etc/init.d"
-
- # remove drop.ceph.com ssh stuff
- rm -f "${pkgdir}"/usr/share/ceph/id_rsa_drop.ceph.com
- rm -f "${pkgdir}"/usr/share/ceph/id_rsa_drop.ceph.com.pub
- rm -f "${pkgdir}"/usr/share/ceph/known_hosts_drop.ceph.com
-
- # fix EnvironmentFile location in systemd service files
- sed -i 's|/etc/sysconfig/|/etc/conf.d/|g' "${pkgdir}"/usr/lib/systemd/system/*.service
-
- # prepare some paths and set correct permissions
- install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/mgr"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: ceph/repos/community-testing-x86_64/PKGBUILD (from rev 548519, ceph/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-01-04 23:17:52 UTC (rev 548520)
@@ -0,0 +1,304 @@
+# Maintainer: Thore Bödecker <foxxx0 at archlinux.org>
+# Contributor: Sébastien "Seblu" Luttringer <seblu at archlinux.org>
+
+pkgbase='ceph'
+pkgname=('ceph' 'ceph-libs' 'ceph-mgr')
+_zstdver=1.4.4
+pkgver=14.2.5
+pkgrel=2
+pkgdesc='Distributed, fault-tolerant storage platform delivering object, block, and file system'
+arch=('x86_64')
+url='https://ceph.com/'
+license=('GPL')
+makedepends=("zstd=${_zstdver}" 'bc' 'boost' 'boost-libs' 'cmake' 'coffeescript'
+ 'cpio' 'crypto++' 'cryptsetup' 'cunit' 'curl' 'cython' 'expat'
+ 'fcgi' 'fontconfig' 'fuse2' 'gcc' 'gcc-libs' 'git' 'glibc' 'gmock'
+ 'gperf' 'gperftools' 'gptfdisk' 'gtest' 'inetutils' 'java-runtime'
+ 'jq' 'jre11-openjdk-headless' 'junit' 'keyutils' 'leveldb' 'libaio'
+ 'libatomic_ops' 'libcap' 'libcap-ng' 'libcroco' 'libcurl-compat'
+ 'libedit' 'libgudev' 'librabbitmq-c' 'libtool' 'libutil-linux'
+ 'libuv' 'libxml2' 'lsb-release' 'lz4' 'ncurses'
+ 'nss' 'oath-toolkit' 'openssl' 'parted' 'pcre' 'pcre2' 'pkgconf'
+ 'procps-ng' 'python-astroid' 'python-attrs' 'python-bcrypt'
+ 'python-cheroot' 'python-cherrypy' 'python-coverage'
+ 'python-elasticsearch' 'python-flask' 'python-flask-restful'
+ 'python-google-api-python-client' 'python-google-auth'
+ 'python-google-auth-httplib2' 'python-grpcio' 'python-isort'
+ 'python-jinja' 'python-lazy-object-proxy' 'python-mccabe'
+ 'python-isodate' 'python-defusedxml' 'python-pkgconfig'
+ 'python-lxml' 'python-xmlsec' 'python-yaml'
+ 'python-more-itertools' 'python-numpy' 'python-pbr' 'python-pecan'
+ 'python-pip' 'python-pluggy' 'python-portend' 'python-prettytable'
+ 'python-prometheus_client' 'python-py' 'python-pycparser'
+ 'python-pyjwt' 'python-pyopenssl' 'python-pytz' 'python-requests'
+ 'python-routes' 'python-scikit-learn' 'python-scipy'
+ 'python-setuptools' 'python-six' 'python-sphinx' 'python-tempora'
+ 'python-virtualenv' 'python-werkzeug' 'python-wrapt' 'rabbitmq'
+ 'sed' 'snappy' 'socat' 'systemd' 'systemd-libs' 'valgrind'
+ 'xfsprogs' 'xmlstarlet' 'xxhash' 'yasm' 'zlib' )
+checkdepends=('python-mock' 'python-nose' 'python-pycodestyle' 'python-pylint'
+ 'python-pytest' 'python-pytest-cov')
+options=('emptydirs')
+source=("https://download.ceph.com/tarballs/${pkgbase}-${pkgver}.tar.gz"
+ 'ceph.sysusers'
+ 'remove-distro-version-detection.patch'
+ 'disable-empty-readable.sh-test.patch'
+ 'use-threadsafe-death-tests-objectstore-memstore.patch'
+ 'use-system-zstd-and-fix-zstd-1.4.0-compatbility.patch'
+ 'suppress-pylint-warnings.patch'
+ 'disable-broken-mgr-dashboard-test.patch'
+ "zstd-${_zstdver}.tar.gz::https://github.com/facebook/zstd/archive/v${_zstdver}.tar.gz")
+sha512sums=('38da62a38960d3618e2689f0e882785d4d95358b4a3b3b5b83e54e227cff9e69f4cca0b63d2d55d69e3916055818e6cf9067f2c2eddeb221ef4bc64a13cfa22b'
+ '4354001c1abd9a0c385ba7bd529e3638fb6660b6a88d4e49706d4ac21c81b8e829303a20fb5445730bdac18c4865efb10bc809c1cd56d743c12aa9a52e160049'
+ '02c9e8fd3c23fb4c9c4c576ee6d06e8525ca31decfd964fb7231e73c98fe2987a483dda680969752186f0918f47d9af4fb09a4901e5319077f45d870906716da'
+ '2234d005df71b3b6013e6b76ad07a5791e3af7efec5f41c78eb1a9c92a22a67f0be9560be59b52534e90bfe251bcf32c33d5d40163f3f8f7e7420691f0f4a222'
+ 'a74aea7c0b0d1883c874f889c184bd2c766fa578d6ca0cbe5eaada840281bb947b3d80f142b30473058cd2652d2967d241ade6914d6be50e93e91728a31733c8'
+ '4345fc2f422c7c1910bfd4068ad39511fa63d8c1e4fc04af416bb0f3869e43327d4a4bfc980d5abf273693a532ac153ed1e4c03e033a127692c1254b99092b8a'
+ '4afd5c3b49a839531921e80b1204ef5b496531a31b3de13042bfcbb548d736851ef7698e41bc94a9bed356e7c2cab6bf30bc711796249cf10ee791974033c29b'
+ '63a92990f979dadb3c23e04e559d95d52cdb3f79115406900ccae67d3f8b1d0658f05431142365eba6ffb7706f9751209f702b69d6ffcd815716ffaf74ebae54'
+ '8209837e8eb14e474dfe21d5511085f46cef93b03ab77613fd41e7b8be652418231c38852669c8e0b55b78ad41ea2cb8008d0da122a83f8f27e32b5c86f045cf')
+
+
+# -fno-plt causes linker errors (undefined reference to internal methods)
+# similar issue: https://bugs.archlinux.org/task/54845
+# https://github.com/intel/media-driver/commit/d95d8f7ab7ac94a2e0f4ee6a4b4794898dc2d3b7
+# as of today (2019-07-12) the upstream maintainers do not consider this a bug in their code
+# (IMHO rightfully so) and thus we strip the option here
+CFLAGS="${CFLAGS/-fno-plt/}"
+CXXFLAGS="${CXXFLAGS/-fno-plt/}"
+
+
+prepare() {
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+
+ # apply patches from the source array
+ local filename
+ for filename in "${source[@]}"; do
+ if [[ "${filename}" =~ \.patch$ ]]; then
+ msg2 "Applying patch ${filename##*/}"
+ patch -p1 -N -i "${srcdir}/${filename##*/}"
+ fi
+ done
+
+ # suppress deprecation warnings
+ sed -i '/#ifndef CEPH_CONFIG_H/i#define BOOST_ALLOW_DEPRECATED_HEADERS' \
+ src/common/config.h
+ sed -i '/#ifndef CEPH_TYPES_H/i#define BOOST_ALLOW_DEPRECATED_HEADERS' \
+ src/include/types.h
+
+ # remove bundled zstd and replace with newer release
+ rm -rf src/zstd
+ ln -sf "${srcdir}/zstd-${_zstdver}" src/zstd
+
+ # remove tests that require root privileges
+ rm src/test/cli/ceph-authtool/cap*.t
+
+ # this test will try to perform btrfs operations when a btrfs mount
+ # is active on the build host, which will fail
+ # if mount | grep 'type btrfs' &>/dev/null; then
+ # sed -i '/run-tox-ceph-disk/d' src/test/CMakeLists.txt
+ # fi
+}
+
+build() {
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+
+ mkdir -p build
+ cd build
+
+ export PYTHON_INCLUDE_DIR="$(python -c "from sysconfig import get_path; print(get_path('include'))")"
+
+ cmake \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_SYSCONFDIR=/etc \
+ -DCMAKE_INSTALL_SBINDIR=/usr/bin \
+ -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+ -DCEPH_SYSTEMD_ENV_DIR=/etc/default \
+ -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib \
+ -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=/usr/lib/systemd/system \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DCMAKE_BUILD_TYPE=RelWithDebInf \
+ -DENABLE_GIT_VERSION=ON \
+ -DWITH_PYTHON2=OFF \
+ -DWITH_PYTHON3=3 \
+ -DMGR_PYTHON_VERSION=3 \
+ -DPYTHON_INCLUDE_DIR="${PYTHON_INCLUDE_DIR:?}" \
+ -DWITH_BABELTRACE=OFF \
+ -DWITH_LTTNG=OFF \
+ -DWITH_OPENLDAP=OFF \
+ -DWITH_RDMA=OFF \
+ -DWITH_TBB=OFF \
+ -DWITH_OCF=OFF \
+ -DWITH_DPDK=OFF \
+ -DWITH_SPDK=OFF \
+ -DWITH_CEPHFS=ON \
+ -DWITH_CEPHFS_JAVA=ON \
+ -DWITH_CEPHFS_SHELL=ON \
+ -DWITH_FUSE=ON \
+ -DWITH_LZ4=ON \
+ -DWITH_XFS=ON \
+ -DWITH_NSS=ON \
+ -DWITH_NUMA=ON \
+ -DWITH_MGR=ON \
+ -DWITH_MGR_DASHBOARD_FRONTEND=ON \
+ -DWITH_RADOSGW=ON \
+ -DWITH_RADOSGW_FCGI_FRONTEND=OFF \
+ -DWITH_RADOSGW_BEAST_FRONTEND=ON \
+ -DWITH_RADOSGW_BEAST_OPENSSL=ON \
+ -DWITH_RADOSGW_AMQP_ENDPOINT=OFF \
+ -DWITH_SSL=ON \
+ -DWITH_SYSTEMD=ON \
+ -DWITH_SYSTEM_BOOST=OFF \
+ -DWITH_BOOST_CONTEXT=ON \
+ -DWITH_SYSTEM_GTEST=OFF \
+ -DWITH_SYSTEM_NPM=OFF \
+ -DENABLE_SHARED=ON \
+ -DWITH_TESTS=ON \
+ ..
+
+ VERBOSE=1 make all
+}
+
+check() {
+ cd "${srcdir}/${pkgbase}-${pkgver}/build"
+
+ export CTEST_PARALLEL_LEVEL="$(nproc)"
+ VERBOSE=1 make check
+
+ # sometimes processes are not properly terminated...
+ for process in ceph-mon ceph-mgr ceph-osd; do
+ pkill -9 "${process}" || true
+ done
+}
+
+package_ceph-libs() {
+ depends=('boost-libs' 'curl' 'glibc' 'keyutils' 'libutil-linux' 'lz4' 'nss'
+ 'oath-toolkit' 'python' 'snappy' 'systemd-libs')
+
+ cd "${srcdir}/${pkgbase}-${pkgver}/build"
+
+ # main install
+ VERBOSE=1 make DESTDIR="${pkgdir}" install
+
+ # remove stuff that goes into the ceph package
+ rm -rf "${pkgdir}"/usr/lib/{ceph/mgr,systemd,sysusers.d,tmpfiles.d}
+ rm -rf "${pkgdir}/usr/share"
+ rm -rf "${pkgdir}/usr/sbin"
+ rm -rf "${pkgdir}/usr/bin"
+ rm -rf "${pkgdir}/etc"
+ rm -rf "${pkgdir}/var"
+}
+
+package_ceph() {
+ depends=("ceph-libs=${pkgver}-${pkgrel}"
+ 'boost-libs' 'curl' 'fuse2' 'glibc' 'gperftools' 'java-runtime'
+ 'keyutils' 'leveldb' 'libaio' 'libutil-linux' 'lsb-release' 'ncurses'
+ 'nss' 'oath-toolkit' 'python' 'python-bcrypt' 'python-setuptools'
+ 'snappy' 'systemd-libs' 'xfsprogs')
+
+ cd "${srcdir}/${pkgbase}-${pkgver}/build"
+
+ # main install
+ VERBOSE=1 make DESTDIR="${pkgdir}" install
+
+ # fix sbin dir (cmake opt seems to have no effect)
+ mv "${pkgdir}"/usr/sbin/* "${pkgdir}/usr/bin/"
+ rm -rf "${pkgdir}/usr/sbin"
+
+ # remove stuff that is in the ceph-libs package
+ find "${pkgdir}/usr/lib" -maxdepth 1 -type f -delete
+ find "${pkgdir}/usr/lib" -maxdepth 1 -type l -delete
+ find "${pkgdir}/usr/lib/ceph" -maxdepth 1 -type f -delete
+ find "${pkgdir}/usr/lib/ceph" -maxdepth 1 -type l -delete
+ rm -rf "${pkgdir}"/usr/lib/{ceph/{compressor,crypto,erasure-code},rados-classes}
+ rm -rf "${pkgdir}"/usr/lib/python*
+ rm -rf "${pkgdir}/usr/include"
+
+ # remove stuff that is in the ceph-mgr package
+ rm -rf "${pkgdir}"/usr/{bin/ceph-mgr,share/ceph/mgr,lib/systemd/system/ceph-mgr*}
+
+ # remove _test_ binaries from the package, not needed
+ find "${pkgdir}/usr/bin" -maxdepth 1 -type f -iname 'ceph_test_*' -delete
+
+ # install tmpfiles.d and sysusers.d stuff
+ install -Dm644 "${srcdir}/${pkgbase}-${pkgver}/systemd/ceph.tmpfiles.d" \
+ "${pkgdir}/usr/lib/tmpfiles.d/${pkgbase}.conf"
+ install -Dm644 "${srcdir}/ceph.sysusers" \
+ "${pkgdir}/usr/lib/sysusers.d/${pkgbase}.conf"
+
+ # remove debian init script
+ rm -rf "${pkgdir}/etc/init.d"
+
+ # remove drop.ceph.com ssh stuff
+ rm -f "${pkgdir}"/usr/share/ceph/id_rsa_drop.ceph.com
+ rm -f "${pkgdir}"/usr/share/ceph/id_rsa_drop.ceph.com.pub
+ rm -f "${pkgdir}"/usr/share/ceph/known_hosts_drop.ceph.com
+
+ # fix bash completions path
+ install -d -m 755 "${pkgdir}/usr/share/bash-completion"
+ mv "${pkgdir}"/{etc/bash_completion.d,usr/share/bash-completion/completions}
+
+ # fix EnvironmentFile location in systemd service files
+ sed -i 's|/etc/sysconfig/|/etc/conf.d/|g' "${pkgdir}"/usr/lib/systemd/system/*.service
+
+ # prepare some paths and set correct permissions
+ install -D -d -m750 -o 0 -g 340 "${pkgdir}/etc/ceph"
+ install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/log/ceph"
+ install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph"
+ install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/bootstrap-mds"
+ install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/bootstrap-osd"
+ install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/bootstrap-rgw"
+ install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/mon"
+ install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/osd"
+}
+
+package_ceph-mgr() {
+ depends=("ceph=${pkgver}-${pkgrel}" "ceph-libs=${pkgver}-${pkgrel}"
+ 'bash' 'boost-libs' 'coffeescript' 'curl' 'gperftools' 'nodejs' 'nss'
+ 'python' 'python-cherrypy' 'python-flask-restful' 'python-pecan'
+ 'python-pyjwt' 'python-routes' 'python-requests' 'python-pyopenssl'
+ 'python-prettytable' 'python-yaml')
+ optdepends=('python-influxdb: influx module'
+ 'python-kubernetes: rook module'
+ 'python-prometheus_client: prometheus module'
+ 'python-remoto: ssh module')
+ conflicts=('ceph<14.2.1-1')
+
+ cd "${srcdir}/${pkgbase}-${pkgver}/build"
+
+ # main install
+ VERBOSE=1 make DESTDIR="${pkgdir}" install
+
+ # fix sbin dir (cmake opt seems to have no effect)
+ mv "${pkgdir}"/usr/sbin/* "${pkgdir}/usr/bin/"
+ rm -rf "${pkgdir}/usr/sbin"
+
+ # remove everything except mgr related stuff, rest is in ceph/ceph-libs
+ rm -rf "${pkgdir}"/usr/lib/{ceph/{compressor,crypto,erasure-code},rados-classes}
+ rm -rf "${pkgdir}/usr/include"
+ find "${pkgdir}/usr/bin" -maxdepth 1 -type f -not -name 'ceph-mgr' -delete
+ find "${pkgdir}"/usr/lib/systemd/system -maxdepth 1 -type f -not -iname 'ceph-mgr*' -delete
+ find "${pkgdir}"/usr/lib -maxdepth 1 -type f -delete
+ find "${pkgdir}"/usr/lib -maxdepth 1 -type l -delete
+ rm -rf "${pkgdir}"/etc
+ rm -rf "${pkgdir}"/var
+ rm -rf "${pkgdir}"/usr/lib/{ceph,sysusers.d,tmpfiles.d}
+ rm -rf "${pkgdir}"/usr/lib/python*
+ rm -rf "${pkgdir}"/usr/share/{bash-completion,doc,java,man}
+
+ # remove debian init script
+ rm -rf "${pkgdir}/etc/init.d"
+
+ # remove drop.ceph.com ssh stuff
+ rm -f "${pkgdir}"/usr/share/ceph/id_rsa_drop.ceph.com
+ rm -f "${pkgdir}"/usr/share/ceph/id_rsa_drop.ceph.com.pub
+ rm -f "${pkgdir}"/usr/share/ceph/known_hosts_drop.ceph.com
+
+ # fix EnvironmentFile location in systemd service files
+ sed -i 's|/etc/sysconfig/|/etc/conf.d/|g' "${pkgdir}"/usr/lib/systemd/system/*.service
+
+ # prepare some paths and set correct permissions
+ install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/mgr"
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: boost-1.67.patch
===================================================================
--- boost-1.67.patch 2020-01-04 23:17:40 UTC (rev 548519)
+++ boost-1.67.patch 2020-01-04 23:17:52 UTC (rev 548520)
@@ -1,11 +0,0 @@
---- a/src/test/librbd/test_mock_Journal.cc 2018-06-03 01:56:35.407273176 +0300
-+++ b/src/test/librbd/test_mock_Journal.cc 2018-06-03 01:56:29.800506081 +0300
-@@ -1,6 +1,8 @@
- // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
- // vim: ts=8 sw=2 smarttab
-
-+#define BOOST_BIND_NO_PLACEHOLDERS
-+
- #include "test/librbd/test_mock_fixture.h"
- #include "test/journal/mock/MockJournaler.h"
- #include "test/librbd/test_support.h"
Copied: ceph/repos/community-testing-x86_64/boost-1.67.patch (from rev 548519, ceph/trunk/boost-1.67.patch)
===================================================================
--- boost-1.67.patch (rev 0)
+++ boost-1.67.patch 2020-01-04 23:17:52 UTC (rev 548520)
@@ -0,0 +1,11 @@
+--- a/src/test/librbd/test_mock_Journal.cc 2018-06-03 01:56:35.407273176 +0300
++++ b/src/test/librbd/test_mock_Journal.cc 2018-06-03 01:56:29.800506081 +0300
+@@ -1,6 +1,8 @@
+ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+ // vim: ts=8 sw=2 smarttab
+
++#define BOOST_BIND_NO_PLACEHOLDERS
++
+ #include "test/librbd/test_mock_fixture.h"
+ #include "test/journal/mock/MockJournaler.h"
+ #include "test/librbd/test_support.h"
Deleted: ceph.sysusers
===================================================================
--- ceph.sysusers 2020-01-04 23:17:40 UTC (rev 548519)
+++ ceph.sysusers 2020-01-04 23:17:52 UTC (rev 548520)
@@ -1 +0,0 @@
-u ceph 340 - /run/ceph
Copied: ceph/repos/community-testing-x86_64/ceph.sysusers (from rev 548519, ceph/trunk/ceph.sysusers)
===================================================================
--- ceph.sysusers (rev 0)
+++ ceph.sysusers 2020-01-04 23:17:52 UTC (rev 548520)
@@ -0,0 +1 @@
+u ceph 340 - /run/ceph
Deleted: disable-broken-mgr-dashboard-test.patch
===================================================================
--- disable-broken-mgr-dashboard-test.patch 2020-01-04 23:17:40 UTC (rev 548519)
+++ disable-broken-mgr-dashboard-test.patch 2020-01-04 23:17:52 UTC (rev 548520)
@@ -1,13 +0,0 @@
---- a/src/test/CMakeLists.txt 2019-12-06 17:42:34.000000000 +0100
-+++ b/src/test/CMakeLists.txt 2020-01-04 09:55:50.703888545 +0100
-@@ -555,8 +555,8 @@ set(env_vars_for_tox_tests
- WITH_PYTHON3=${WITH_PYTHON3})
-
- if(WITH_MGR)
-- add_test(NAME run-tox-mgr-dashboard COMMAND bash ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/run-tox.sh)
-- list(APPEND tox_tests run-tox-mgr-dashboard)
-+ # add_test(NAME run-tox-mgr-dashboard COMMAND bash ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/run-tox.sh)
-+ # list(APPEND tox_tests run-tox-mgr-dashboard)
- set(MGR_DASHBOARD_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/mgr-dashboard-virtualenv)
- list(APPEND env_vars_for_tox_tests MGR_DASHBOARD_VIRTUALENV=${MGR_DASHBOARD_VIRTUALENV})
-
Copied: ceph/repos/community-testing-x86_64/disable-broken-mgr-dashboard-test.patch (from rev 548519, ceph/trunk/disable-broken-mgr-dashboard-test.patch)
===================================================================
--- disable-broken-mgr-dashboard-test.patch (rev 0)
+++ disable-broken-mgr-dashboard-test.patch 2020-01-04 23:17:52 UTC (rev 548520)
@@ -0,0 +1,13 @@
+--- a/src/test/CMakeLists.txt 2019-12-06 17:42:34.000000000 +0100
++++ b/src/test/CMakeLists.txt 2020-01-04 09:55:50.703888545 +0100
+@@ -555,8 +555,8 @@ set(env_vars_for_tox_tests
+ WITH_PYTHON3=${WITH_PYTHON3})
+
+ if(WITH_MGR)
+- add_test(NAME run-tox-mgr-dashboard COMMAND bash ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/run-tox.sh)
+- list(APPEND tox_tests run-tox-mgr-dashboard)
++ # add_test(NAME run-tox-mgr-dashboard COMMAND bash ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/run-tox.sh)
++ # list(APPEND tox_tests run-tox-mgr-dashboard)
+ set(MGR_DASHBOARD_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/mgr-dashboard-virtualenv)
+ list(APPEND env_vars_for_tox_tests MGR_DASHBOARD_VIRTUALENV=${MGR_DASHBOARD_VIRTUALENV})
+
Deleted: disable-empty-readable.sh-test.patch
===================================================================
--- disable-empty-readable.sh-test.patch 2020-01-04 23:17:40 UTC (rev 548519)
+++ disable-empty-readable.sh-test.patch 2020-01-04 23:17:52 UTC (rev 548520)
@@ -1,6 +0,0 @@
---- a/src/test/encoding/CMakeLists.txt 2019-04-25 20:15:48.000000000 +0200
-+++ b/src/test/encoding/CMakeLists.txt 2019-07-14 21:11:37.380428899 +0200
-@@ -1,3 +1,2 @@
- # scripts
- add_ceph_test(check-generated.sh ${CMAKE_CURRENT_SOURCE_DIR}/check-generated.sh)
--add_ceph_test(readable.sh ${CMAKE_CURRENT_SOURCE_DIR}/readable.sh)
Copied: ceph/repos/community-testing-x86_64/disable-empty-readable.sh-test.patch (from rev 548519, ceph/trunk/disable-empty-readable.sh-test.patch)
===================================================================
--- disable-empty-readable.sh-test.patch (rev 0)
+++ disable-empty-readable.sh-test.patch 2020-01-04 23:17:52 UTC (rev 548520)
@@ -0,0 +1,6 @@
+--- a/src/test/encoding/CMakeLists.txt 2019-04-25 20:15:48.000000000 +0200
++++ b/src/test/encoding/CMakeLists.txt 2019-07-14 21:11:37.380428899 +0200
+@@ -1,3 +1,2 @@
+ # scripts
+ add_ceph_test(check-generated.sh ${CMAKE_CURRENT_SOURCE_DIR}/check-generated.sh)
+-add_ceph_test(readable.sh ${CMAKE_CURRENT_SOURCE_DIR}/readable.sh)
Deleted: exclude-frontend-from-mgr-dashboard-cov.patch
===================================================================
--- exclude-frontend-from-mgr-dashboard-cov.patch 2020-01-04 23:17:40 UTC (rev 548519)
+++ exclude-frontend-from-mgr-dashboard-cov.patch 2020-01-04 23:17:52 UTC (rev 548520)
@@ -1,11 +0,0 @@
---- a/src/pybind/mgr/dashboard/tox.ini 2019-12-06 17:42:34.000000000 +0100
-+++ c/src/pybind/mgr/dashboard/tox.ini 2020-01-03 15:25:30.074706391 +0100
-@@ -20,7 +20,7 @@ commands=
- py27: pip install -r {toxinidir}/requirements-py27.txt
- py3: pip install -r {toxinidir}/requirements-py3.txt
- cov: coverage erase
-- cov: {envbindir}/py.test --cov=. --cov-report= --junitxml=junit.{envname}.xml --doctest-modules controllers services/ tests/ tools.py
-+ cov: {envbindir}/py.test --cov=. --cov-report= --junitxml=junit.{envname}.xml --ignore=frontend/ --doctest-modules controllers services/ tests/ tools.py
- cov: coverage combine {toxinidir}/{env:COVERAGE_FILE}
- cov: coverage report
- cov: coverage xml
Copied: ceph/repos/community-testing-x86_64/exclude-frontend-from-mgr-dashboard-cov.patch (from rev 548519, ceph/trunk/exclude-frontend-from-mgr-dashboard-cov.patch)
===================================================================
--- exclude-frontend-from-mgr-dashboard-cov.patch (rev 0)
+++ exclude-frontend-from-mgr-dashboard-cov.patch 2020-01-04 23:17:52 UTC (rev 548520)
@@ -0,0 +1,11 @@
+--- a/src/pybind/mgr/dashboard/tox.ini 2019-12-06 17:42:34.000000000 +0100
++++ c/src/pybind/mgr/dashboard/tox.ini 2020-01-03 15:25:30.074706391 +0100
+@@ -20,7 +20,7 @@ commands=
+ py27: pip install -r {toxinidir}/requirements-py27.txt
+ py3: pip install -r {toxinidir}/requirements-py3.txt
+ cov: coverage erase
+- cov: {envbindir}/py.test --cov=. --cov-report= --junitxml=junit.{envname}.xml --doctest-modules controllers services/ tests/ tools.py
++ cov: {envbindir}/py.test --cov=. --cov-report= --junitxml=junit.{envname}.xml --ignore=frontend/ --doctest-modules controllers services/ tests/ tools.py
+ cov: coverage combine {toxinidir}/{env:COVERAGE_FILE}
+ cov: coverage report
+ cov: coverage xml
Deleted: fix-ceph_disk-python-interpreter.patch
===================================================================
--- fix-ceph_disk-python-interpreter.patch 2020-01-04 23:17:40 UTC (rev 548519)
+++ fix-ceph_disk-python-interpreter.patch 2020-01-04 23:17:52 UTC (rev 548520)
@@ -1,8 +0,0 @@
---- a/src/ceph-disk/ceph_disk/main.py 2017-08-28 18:30:20.000000000 +0200
-+++ b/src/ceph-disk/ceph_disk/main.py 2017-09-21 13:50:39.373573382 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- #
- # Copyright (C) 2015, 2016, 2017 Red Hat <contact at redhat.com>
- # Copyright (C) 2014 Inktank <info at inktank.com>
Copied: ceph/repos/community-testing-x86_64/fix-ceph_disk-python-interpreter.patch (from rev 548519, ceph/trunk/fix-ceph_disk-python-interpreter.patch)
===================================================================
--- fix-ceph_disk-python-interpreter.patch (rev 0)
+++ fix-ceph_disk-python-interpreter.patch 2020-01-04 23:17:52 UTC (rev 548520)
@@ -0,0 +1,8 @@
+--- a/src/ceph-disk/ceph_disk/main.py 2017-08-28 18:30:20.000000000 +0200
++++ b/src/ceph-disk/ceph_disk/main.py 2017-09-21 13:50:39.373573382 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ #
+ # Copyright (C) 2015, 2016, 2017 Red Hat <contact at redhat.com>
+ # Copyright (C) 2014 Inktank <info at inktank.com>
Deleted: fix-python2-paths.patch
===================================================================
--- fix-python2-paths.patch 2020-01-04 23:17:40 UTC (rev 548519)
+++ fix-python2-paths.patch 2020-01-04 23:17:52 UTC (rev 548520)
@@ -1,52 +0,0 @@
---- a/CMakeLists.txt 2018-05-29 14:04:02.000000000 +0200
-+++ b/CMakeLists.txt 2018-06-04 13:41:55.684455580 +0200
-@@ -49,7 +49,7 @@ endif(WITH_CCACHE)
- option(WITH_MANPAGE "Build man pages." ON)
- if(WITH_MANPAGE)
- find_program(SPHINX_BUILD
-- sphinx-build)
-+ sphinx-build2)
- if(NOT SPHINX_BUILD)
- message(FATAL_ERROR "Can't find sphinx-build.")
- endif(NOT SPHINX_BUILD)
---- a/src/tools/setup-virtualenv.sh 2018-05-29 14:04:02.000000000 +0200
-+++ b/src/tools/setup-virtualenv.sh 2018-06-04 13:43:24.767175961 +0200
-@@ -58,10 +58,10 @@ if [ -z "$DIR" ] ; then
- fi
- rm -fr $DIR
- mkdir -p $DIR
--virtualenv --python $PYTHON_BINARY $DIR
-+virtualenv2 --python $PYTHON_BINARY $DIR
- . $DIR/bin/activate
-
--if pip --help | grep -q disable-pip-version-check; then
-+if pip2 --help | grep -q disable-pip-version-check; then
- DISABLE_PIP_VERSION_CHECK=--disable-pip-version-check
- else
- DISABLE_PIP_VERSION_CHECK=
-@@ -69,12 +69,12 @@ fi
-
- # older versions of pip will not install wrap_console scripts
- # when using wheel packages
--pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install --upgrade 'pip >= 6.1'
-+pip2 $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install --upgrade 'pip >= 6.1'
-
- # workaround of https://github.com/pypa/setuptools/issues/1042
--pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install --upgrade "setuptools < 36"
-+pip2 $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install --upgrade "setuptools < 36"
-
--if pip --help | grep -q disable-pip-version-check; then
-+if pip2 --help | grep -q disable-pip-version-check; then
- DISABLE_PIP_VERSION_CHECK=--disable-pip-version-check
- else
- DISABLE_PIP_VERSION_CHECK=
-@@ -84,7 +84,7 @@ if test -d wheelhouse ; then
- export NO_INDEX=--no-index
- fi
-
--pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install $NO_INDEX --find-links=file://$(pwd)/wheelhouse 'tox >=2.9.1'
-+pip2 $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install $NO_INDEX --find-links=file://$(pwd)/wheelhouse 'tox >=2.9.1'
- if test -f requirements.txt ; then
-- pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install $NO_INDEX --find-links=file://$(pwd)/wheelhouse -r requirements.txt
-+ pip2 $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install $NO_INDEX --find-links=file://$(pwd)/wheelhouse -r requirements.txt
- fi
Copied: ceph/repos/community-testing-x86_64/fix-python2-paths.patch (from rev 548519, ceph/trunk/fix-python2-paths.patch)
===================================================================
--- fix-python2-paths.patch (rev 0)
+++ fix-python2-paths.patch 2020-01-04 23:17:52 UTC (rev 548520)
@@ -0,0 +1,52 @@
+--- a/CMakeLists.txt 2018-05-29 14:04:02.000000000 +0200
++++ b/CMakeLists.txt 2018-06-04 13:41:55.684455580 +0200
+@@ -49,7 +49,7 @@ endif(WITH_CCACHE)
+ option(WITH_MANPAGE "Build man pages." ON)
+ if(WITH_MANPAGE)
+ find_program(SPHINX_BUILD
+- sphinx-build)
++ sphinx-build2)
+ if(NOT SPHINX_BUILD)
+ message(FATAL_ERROR "Can't find sphinx-build.")
+ endif(NOT SPHINX_BUILD)
+--- a/src/tools/setup-virtualenv.sh 2018-05-29 14:04:02.000000000 +0200
++++ b/src/tools/setup-virtualenv.sh 2018-06-04 13:43:24.767175961 +0200
+@@ -58,10 +58,10 @@ if [ -z "$DIR" ] ; then
+ fi
+ rm -fr $DIR
+ mkdir -p $DIR
+-virtualenv --python $PYTHON_BINARY $DIR
++virtualenv2 --python $PYTHON_BINARY $DIR
+ . $DIR/bin/activate
+
+-if pip --help | grep -q disable-pip-version-check; then
++if pip2 --help | grep -q disable-pip-version-check; then
+ DISABLE_PIP_VERSION_CHECK=--disable-pip-version-check
+ else
+ DISABLE_PIP_VERSION_CHECK=
+@@ -69,12 +69,12 @@ fi
+
+ # older versions of pip will not install wrap_console scripts
+ # when using wheel packages
+-pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install --upgrade 'pip >= 6.1'
++pip2 $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install --upgrade 'pip >= 6.1'
+
+ # workaround of https://github.com/pypa/setuptools/issues/1042
+-pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install --upgrade "setuptools < 36"
++pip2 $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install --upgrade "setuptools < 36"
+
+-if pip --help | grep -q disable-pip-version-check; then
++if pip2 --help | grep -q disable-pip-version-check; then
+ DISABLE_PIP_VERSION_CHECK=--disable-pip-version-check
+ else
+ DISABLE_PIP_VERSION_CHECK=
+@@ -84,7 +84,7 @@ if test -d wheelhouse ; then
+ export NO_INDEX=--no-index
+ fi
+
+-pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install $NO_INDEX --find-links=file://$(pwd)/wheelhouse 'tox >=2.9.1'
++pip2 $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install $NO_INDEX --find-links=file://$(pwd)/wheelhouse 'tox >=2.9.1'
+ if test -f requirements.txt ; then
+- pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install $NO_INDEX --find-links=file://$(pwd)/wheelhouse -r requirements.txt
++ pip2 $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install $NO_INDEX --find-links=file://$(pwd)/wheelhouse -r requirements.txt
+ fi
Deleted: fix-tox-test-commands.patch
===================================================================
--- fix-tox-test-commands.patch 2020-01-04 23:17:40 UTC (rev 548519)
+++ fix-tox-test-commands.patch 2020-01-04 23:17:52 UTC (rev 548520)
@@ -1,160 +0,0 @@
---- a/src/pybind/mgr/ansible/run-tox.sh 2019-04-25 20:15:48.000000000 +0200
-+++ b/src/pybind/mgr/ansible/run-tox.sh 2019-07-14 16:36:54.220654727 +0200
-@@ -8,22 +8,22 @@
- test -d ansible && cd ansible
-
- if [ -e tox.ini ]; then
-- TOX_PATH=$(readlink -f tox.ini)
-+ TOX_PATH="$(readlink -f tox.ini)"
- else
-- TOX_PATH=$(readlink -f $(dirname $0)/tox.ini)
-+ TOX_PATH="$(readlink -f "$(dirname "$0")"/tox.ini)"
- fi
-
- # tox.ini will take care of this.
- unset PYTHONPATH
- export CEPH_BUILD_DIR=$CEPH_BUILD_DIR
-
--source ${MGR_ANSIBLE_VIRTUALENV}/bin/activate
-+source "${MGR_ANSIBLE_VIRTUALENV}"/bin/activate
-
- if [ "$WITH_PYTHON2" = "ON" ]; then
- ENV_LIST+="py27"
- fi
--if [ "$WITH_PYTHON3" = "ON" ]; then
-+if [[ "$WITH_PYTHON3" == "ON" || "$WITH_PYTHON3" == "3" ]]; then
- ENV_LIST+="py3"
- fi
-
--tox -c ${TOX_PATH} -e ${ENV_LIST}
-+tox -c "${TOX_PATH}" -e "${ENV_LIST}"
---- a/src/pybind/mgr/dashboard/run-tox.sh 2019-04-25 20:15:48.000000000 +0200
-+++ b/src/pybind/mgr/dashboard/run-tox.sh 2019-07-14 16:36:48.907269344 +0200
-@@ -8,30 +8,30 @@
- test -d dashboard && cd dashboard
-
- if [ -e tox.ini ]; then
-- TOX_PATH=`readlink -f tox.ini`
-+ TOX_PATH="$(readlink -f tox.ini)"
- else
-- TOX_PATH=`readlink -f $(dirname $0)/tox.ini`
-+ TOX_PATH="$(readlink -f "$(dirname "$0")"/tox.ini)"
- fi
-
- # tox.ini will take care of this.
- unset PYTHONPATH
- export CEPH_BUILD_DIR=$CEPH_BUILD_DIR
-
--source ${MGR_DASHBOARD_VIRTUALENV}/bin/activate
-+source "${MGR_DASHBOARD_VIRTUALENV}"/bin/activate
-
--if [ "$WITH_PYTHON2" = "ON" ]; then
-- if [[ -n "$@" ]]; then
-+if [ "$WITH_PYTHON2" == "ON" ]; then
-+ if [[ -n "$*" ]]; then
- ENV_LIST+="py27-run,"
- else
- ENV_LIST+="py27-cov,py27-lint,"
- fi
- fi
--if [ "$WITH_PYTHON3" = "ON" ]; then
-- if [[ -n "$@" ]]; then
-+if [[ "$WITH_PYTHON3" == "ON" || "$WITH_PYTHON3" == "3" ]]; then
-+ if [[ -n "$*" ]]; then
- ENV_LIST+="py3-run"
- else
- ENV_LIST+="py3-cov,py3-lint"
- fi
- fi
-
--tox -c ${TOX_PATH} -e "$ENV_LIST" "$@"
-+tox -c "${TOX_PATH}" -e "$ENV_LIST" "$@"
---- a/src/pybind/mgr/insights/run-tox.sh 2019-04-25 20:15:48.000000000 +0200
-+++ b/src/pybind/mgr/insights/run-tox.sh 2019-07-14 16:36:41.347195419 +0200
-@@ -8,22 +8,22 @@
- test -d insights && cd insights
-
- if [ -e tox.ini ]; then
-- TOX_PATH=`readlink -f tox.ini`
-+ TOX_PATH="$(readlink -f tox.ini)"
- else
-- TOX_PATH=`readlink -f $(dirname $0)/tox.ini`
-+ TOX_PATH="$(readlink -f "$(dirname "$0")"/tox.ini)"
- fi
-
- # tox.ini will take care of this.
- unset PYTHONPATH
- export CEPH_BUILD_DIR=$CEPH_BUILD_DIR
-
--source ${MGR_INSIGHTS_VIRTUALENV}/bin/activate
-+source "${MGR_INSIGHTS_VIRTUALENV}"/bin/activate
-
- if [ "$WITH_PYTHON2" = "ON" ]; then
- ENV_LIST+="py27"
- fi
--if [ "$WITH_PYTHON3" = "ON" ]; then
-+if [[ "$WITH_PYTHON3" == "ON" || "$WITH_PYTHON3" == "3" ]]; then
- ENV_LIST+="py3"
- fi
-
--tox -c ${TOX_PATH} -e ${ENV_LIST}
-+tox -c "${TOX_PATH}" -e "${ENV_LIST}"
---- a/src/pybind/mgr/orchestrator_cli/run-tox.sh 2019-04-25 20:15:48.000000000 +0200
-+++ b/src/pybind/mgr/orchestrator_cli/run-tox.sh 2019-07-14 16:37:01.734061798 +0200
-@@ -8,25 +8,24 @@
- test -d orchestrator_cli && cd orchestrator_cli
-
- if [ -e tox.ini ]; then
-- TOX_PATH=$(readlink -f tox.ini)
-+ TOX_PATH="$(readlink -f tox.ini)"
- else
-- TOX_PATH=$(readlink -f $(dirname $0)/tox.ini)
-+ TOX_PATH="$(readlink -f "$(dirname "$0")"/tox.ini)"
- fi
-
- # tox.ini will take care of this.
- unset PYTHONPATH
- export CEPH_BUILD_DIR=$CEPH_BUILD_DIR
-
--if [ -f ${MGR_ORCHESTRATOR_CLI_VIRTUALENV}/bin/activate ]
--then
-- source ${MGR_ORCHESTRATOR_CLI_VIRTUALENV}/bin/activate
-+if [[ -r "${MGR_ORCHESTRATOR_CLI_VIRTUALENV}"/bin/activate ]]; then
-+ source "${MGR_ORCHESTRATOR_CLI_VIRTUALENV}"/bin/activate
- fi
-
- if [ "$WITH_PYTHON2" = "ON" ]; then
- ENV_LIST+="py27"
- fi
--if [ "$WITH_PYTHON3" = "ON" ]; then
-- ENV_LIST+=",py3"
-+if [[ "$WITH_PYTHON3" == "ON" || "$WITH_PYTHON3" == "3" ]]; then
-+ ENV_LIST+="py3"
- fi
-
--tox -c ${TOX_PATH} -e ${ENV_LIST}
-+tox -c "${TOX_PATH}" -e "${ENV_LIST}"
---- a/src/pybind/mgr/dashboard/tox.ini 2019-04-25 20:15:48.000000000 +0200
-+++ b/src/pybind/mgr/dashboard/tox.ini 2019-07-15 12:36:39.693948289 +0200
-@@ -1,5 +1,5 @@
- [tox]
--envlist = py27-{cov,lint,run},py3-{cov,lint,run}
-+envlist = py3-{cov,lint,run}
- skipsdist = true
- toxworkdir = {env:CEPH_BUILD_DIR}/dashboard
- minversion = 2.8.1
-@@ -11,13 +11,12 @@ setenv=
- WEBTEST_INTERACTIVE = false
- LD_LIBRARY_PATH = {toxinidir}/../../../../build/lib
- PATH = {toxinidir}/../../../../build/bin:$PATH
-- py27: PYTHONPATH = {toxinidir}/../../../../build/lib/cython_modules/lib.2
- py3: PYTHONPATH = {toxinidir}/../../../../build/lib/cython_modules/lib.3
- cov: UNITTEST = true
- cov: COVERAGE_FILE = .coverage.{envname}
- commands=
- pip install -r {toxinidir}/requirements.txt
-- py27: pip install -r {toxinidir}/requirements-py27.txt
-+; py27: pip install -r {toxinidir}/requirements-py27.txt
- py3: pip install -r {toxinidir}/requirements-py3.txt
- cov: coverage erase
- cov: {envbindir}/py.test --cov=. --cov-report= --junitxml=junit.{envname}.xml --doctest-modules controllers/rbd.py services/ tests/ tools.py
Copied: ceph/repos/community-testing-x86_64/fix-tox-test-commands.patch (from rev 548519, ceph/trunk/fix-tox-test-commands.patch)
===================================================================
--- fix-tox-test-commands.patch (rev 0)
+++ fix-tox-test-commands.patch 2020-01-04 23:17:52 UTC (rev 548520)
@@ -0,0 +1,160 @@
+--- a/src/pybind/mgr/ansible/run-tox.sh 2019-04-25 20:15:48.000000000 +0200
++++ b/src/pybind/mgr/ansible/run-tox.sh 2019-07-14 16:36:54.220654727 +0200
+@@ -8,22 +8,22 @@
+ test -d ansible && cd ansible
+
+ if [ -e tox.ini ]; then
+- TOX_PATH=$(readlink -f tox.ini)
++ TOX_PATH="$(readlink -f tox.ini)"
+ else
+- TOX_PATH=$(readlink -f $(dirname $0)/tox.ini)
++ TOX_PATH="$(readlink -f "$(dirname "$0")"/tox.ini)"
+ fi
+
+ # tox.ini will take care of this.
+ unset PYTHONPATH
+ export CEPH_BUILD_DIR=$CEPH_BUILD_DIR
+
+-source ${MGR_ANSIBLE_VIRTUALENV}/bin/activate
++source "${MGR_ANSIBLE_VIRTUALENV}"/bin/activate
+
+ if [ "$WITH_PYTHON2" = "ON" ]; then
+ ENV_LIST+="py27"
+ fi
+-if [ "$WITH_PYTHON3" = "ON" ]; then
++if [[ "$WITH_PYTHON3" == "ON" || "$WITH_PYTHON3" == "3" ]]; then
+ ENV_LIST+="py3"
+ fi
+
+-tox -c ${TOX_PATH} -e ${ENV_LIST}
++tox -c "${TOX_PATH}" -e "${ENV_LIST}"
+--- a/src/pybind/mgr/dashboard/run-tox.sh 2019-04-25 20:15:48.000000000 +0200
++++ b/src/pybind/mgr/dashboard/run-tox.sh 2019-07-14 16:36:48.907269344 +0200
+@@ -8,30 +8,30 @@
+ test -d dashboard && cd dashboard
+
+ if [ -e tox.ini ]; then
+- TOX_PATH=`readlink -f tox.ini`
++ TOX_PATH="$(readlink -f tox.ini)"
+ else
+- TOX_PATH=`readlink -f $(dirname $0)/tox.ini`
++ TOX_PATH="$(readlink -f "$(dirname "$0")"/tox.ini)"
+ fi
+
+ # tox.ini will take care of this.
+ unset PYTHONPATH
+ export CEPH_BUILD_DIR=$CEPH_BUILD_DIR
+
+-source ${MGR_DASHBOARD_VIRTUALENV}/bin/activate
++source "${MGR_DASHBOARD_VIRTUALENV}"/bin/activate
+
+-if [ "$WITH_PYTHON2" = "ON" ]; then
+- if [[ -n "$@" ]]; then
++if [ "$WITH_PYTHON2" == "ON" ]; then
++ if [[ -n "$*" ]]; then
+ ENV_LIST+="py27-run,"
+ else
+ ENV_LIST+="py27-cov,py27-lint,"
+ fi
+ fi
+-if [ "$WITH_PYTHON3" = "ON" ]; then
+- if [[ -n "$@" ]]; then
++if [[ "$WITH_PYTHON3" == "ON" || "$WITH_PYTHON3" == "3" ]]; then
++ if [[ -n "$*" ]]; then
+ ENV_LIST+="py3-run"
+ else
+ ENV_LIST+="py3-cov,py3-lint"
+ fi
+ fi
+
+-tox -c ${TOX_PATH} -e "$ENV_LIST" "$@"
++tox -c "${TOX_PATH}" -e "$ENV_LIST" "$@"
+--- a/src/pybind/mgr/insights/run-tox.sh 2019-04-25 20:15:48.000000000 +0200
++++ b/src/pybind/mgr/insights/run-tox.sh 2019-07-14 16:36:41.347195419 +0200
+@@ -8,22 +8,22 @@
+ test -d insights && cd insights
+
+ if [ -e tox.ini ]; then
+- TOX_PATH=`readlink -f tox.ini`
++ TOX_PATH="$(readlink -f tox.ini)"
+ else
+- TOX_PATH=`readlink -f $(dirname $0)/tox.ini`
++ TOX_PATH="$(readlink -f "$(dirname "$0")"/tox.ini)"
+ fi
+
+ # tox.ini will take care of this.
+ unset PYTHONPATH
+ export CEPH_BUILD_DIR=$CEPH_BUILD_DIR
+
+-source ${MGR_INSIGHTS_VIRTUALENV}/bin/activate
++source "${MGR_INSIGHTS_VIRTUALENV}"/bin/activate
+
+ if [ "$WITH_PYTHON2" = "ON" ]; then
+ ENV_LIST+="py27"
+ fi
+-if [ "$WITH_PYTHON3" = "ON" ]; then
++if [[ "$WITH_PYTHON3" == "ON" || "$WITH_PYTHON3" == "3" ]]; then
+ ENV_LIST+="py3"
+ fi
+
+-tox -c ${TOX_PATH} -e ${ENV_LIST}
++tox -c "${TOX_PATH}" -e "${ENV_LIST}"
+--- a/src/pybind/mgr/orchestrator_cli/run-tox.sh 2019-04-25 20:15:48.000000000 +0200
++++ b/src/pybind/mgr/orchestrator_cli/run-tox.sh 2019-07-14 16:37:01.734061798 +0200
+@@ -8,25 +8,24 @@
+ test -d orchestrator_cli && cd orchestrator_cli
+
+ if [ -e tox.ini ]; then
+- TOX_PATH=$(readlink -f tox.ini)
++ TOX_PATH="$(readlink -f tox.ini)"
+ else
+- TOX_PATH=$(readlink -f $(dirname $0)/tox.ini)
++ TOX_PATH="$(readlink -f "$(dirname "$0")"/tox.ini)"
+ fi
+
+ # tox.ini will take care of this.
+ unset PYTHONPATH
+ export CEPH_BUILD_DIR=$CEPH_BUILD_DIR
+
+-if [ -f ${MGR_ORCHESTRATOR_CLI_VIRTUALENV}/bin/activate ]
+-then
+- source ${MGR_ORCHESTRATOR_CLI_VIRTUALENV}/bin/activate
++if [[ -r "${MGR_ORCHESTRATOR_CLI_VIRTUALENV}"/bin/activate ]]; then
++ source "${MGR_ORCHESTRATOR_CLI_VIRTUALENV}"/bin/activate
+ fi
+
+ if [ "$WITH_PYTHON2" = "ON" ]; then
+ ENV_LIST+="py27"
+ fi
+-if [ "$WITH_PYTHON3" = "ON" ]; then
+- ENV_LIST+=",py3"
++if [[ "$WITH_PYTHON3" == "ON" || "$WITH_PYTHON3" == "3" ]]; then
++ ENV_LIST+="py3"
+ fi
+
+-tox -c ${TOX_PATH} -e ${ENV_LIST}
++tox -c "${TOX_PATH}" -e "${ENV_LIST}"
+--- a/src/pybind/mgr/dashboard/tox.ini 2019-04-25 20:15:48.000000000 +0200
++++ b/src/pybind/mgr/dashboard/tox.ini 2019-07-15 12:36:39.693948289 +0200
+@@ -1,5 +1,5 @@
+ [tox]
+-envlist = py27-{cov,lint,run},py3-{cov,lint,run}
++envlist = py3-{cov,lint,run}
+ skipsdist = true
+ toxworkdir = {env:CEPH_BUILD_DIR}/dashboard
+ minversion = 2.8.1
+@@ -11,13 +11,12 @@ setenv=
+ WEBTEST_INTERACTIVE = false
+ LD_LIBRARY_PATH = {toxinidir}/../../../../build/lib
+ PATH = {toxinidir}/../../../../build/bin:$PATH
+- py27: PYTHONPATH = {toxinidir}/../../../../build/lib/cython_modules/lib.2
+ py3: PYTHONPATH = {toxinidir}/../../../../build/lib/cython_modules/lib.3
+ cov: UNITTEST = true
+ cov: COVERAGE_FILE = .coverage.{envname}
+ commands=
+ pip install -r {toxinidir}/requirements.txt
+- py27: pip install -r {toxinidir}/requirements-py27.txt
++; py27: pip install -r {toxinidir}/requirements-py27.txt
+ py3: pip install -r {toxinidir}/requirements-py3.txt
+ cov: coverage erase
+ cov: {envbindir}/py.test --cov=. --cov-report= --junitxml=junit.{envname}.xml --doctest-modules controllers/rbd.py services/ tests/ tools.py
Deleted: remove-distro-version-detection.patch
===================================================================
--- remove-distro-version-detection.patch 2020-01-04 23:17:40 UTC (rev 548519)
+++ remove-distro-version-detection.patch 2020-01-04 23:17:52 UTC (rev 548520)
@@ -1,10 +0,0 @@
---- a/src/common/util.cc 2018-05-29 14:04:02.000000000 +0200
-+++ b/src/common/util.cc 2018-06-04 13:45:52.279495745 +0200
-@@ -96,7 +96,6 @@ static bool os_release_parse(map<string,
- static const map<string, string> kvm = {
- { "distro", "ID=" },
- { "distro_description", "PRETTY_NAME=" },
-- { "distro_version", "VERSION_ID=" }
- };
-
- FILE *fp = fopen("/etc/os-release", "r");
Copied: ceph/repos/community-testing-x86_64/remove-distro-version-detection.patch (from rev 548519, ceph/trunk/remove-distro-version-detection.patch)
===================================================================
--- remove-distro-version-detection.patch (rev 0)
+++ remove-distro-version-detection.patch 2020-01-04 23:17:52 UTC (rev 548520)
@@ -0,0 +1,10 @@
+--- a/src/common/util.cc 2018-05-29 14:04:02.000000000 +0200
++++ b/src/common/util.cc 2018-06-04 13:45:52.279495745 +0200
+@@ -96,7 +96,6 @@ static bool os_release_parse(map<string,
+ static const map<string, string> kvm = {
+ { "distro", "ID=" },
+ { "distro_description", "PRETTY_NAME=" },
+- { "distro_version", "VERSION_ID=" }
+ };
+
+ FILE *fp = fopen("/etc/os-release", "r");
Deleted: suppress-pylint-warnings.patch
===================================================================
--- suppress-pylint-warnings.patch 2020-01-04 23:17:40 UTC (rev 548519)
+++ suppress-pylint-warnings.patch 2020-01-04 23:17:52 UTC (rev 548520)
@@ -1,23 +0,0 @@
---- a/src/pybind/mgr/dashboard/.pylintrc 2019-12-06 17:42:34.000000000 +0100
-+++ b/src/pybind/mgr/dashboard/.pylintrc 2020-01-03 13:55:54.511393504 +0100
-@@ -119,7 +119,11 @@ disable=import-star-module-level,
- too-many-arguments,
- too-many-locals,
- too-many-statements,
-- useless-object-inheritance
-+ useless-object-inheritance,
-+ no-else-raise,
-+ multiple-statements,
-+ unused-argument,
-+ protected-access
-
-
- # Enable the message, report, category or checker with the given id(s). You can
---- a/src/pybind/mgr/dashboard/services/rgw_client.py 2019-12-06 17:42:34.000000000 +0100
-+++ b/src/pybind/mgr/dashboard/services/rgw_client.py 2020-01-03 15:13:15.266131061 +0100
-@@ -1,4 +1,5 @@
- # -*- coding: utf-8 -*-
-+# pylint: disable=unused-argument
- from __future__ import absolute_import
-
- import re
Copied: ceph/repos/community-testing-x86_64/suppress-pylint-warnings.patch (from rev 548519, ceph/trunk/suppress-pylint-warnings.patch)
===================================================================
--- suppress-pylint-warnings.patch (rev 0)
+++ suppress-pylint-warnings.patch 2020-01-04 23:17:52 UTC (rev 548520)
@@ -0,0 +1,23 @@
+--- a/src/pybind/mgr/dashboard/.pylintrc 2019-12-06 17:42:34.000000000 +0100
++++ b/src/pybind/mgr/dashboard/.pylintrc 2020-01-03 13:55:54.511393504 +0100
+@@ -119,7 +119,11 @@ disable=import-star-module-level,
+ too-many-arguments,
+ too-many-locals,
+ too-many-statements,
+- useless-object-inheritance
++ useless-object-inheritance,
++ no-else-raise,
++ multiple-statements,
++ unused-argument,
++ protected-access
+
+
+ # Enable the message, report, category or checker with the given id(s). You can
+--- a/src/pybind/mgr/dashboard/services/rgw_client.py 2019-12-06 17:42:34.000000000 +0100
++++ b/src/pybind/mgr/dashboard/services/rgw_client.py 2020-01-03 15:13:15.266131061 +0100
+@@ -1,4 +1,5 @@
+ # -*- coding: utf-8 -*-
++# pylint: disable=unused-argument
+ from __future__ import absolute_import
+
+ import re
Deleted: use-system-zstd-and-fix-zstd-1.4.0-compatbility.patch
===================================================================
--- use-system-zstd-and-fix-zstd-1.4.0-compatbility.patch 2020-01-04 23:17:40 UTC (rev 548519)
+++ use-system-zstd-and-fix-zstd-1.4.0-compatbility.patch 2020-01-04 23:17:52 UTC (rev 548520)
@@ -1,35 +0,0 @@
---- a/src/compressor/zstd/ZstdCompressor.h 2019-04-25 20:15:48.000000000 +0200
-+++ b/src/compressor/zstd/ZstdCompressor.h 2019-07-17 19:11:33.177014923 +0200
-@@ -16,7 +16,7 @@
- #define CEPH_ZSTDCOMPRESSOR_H
-
- #define ZSTD_STATIC_LINKING_ONLY
--#include "zstd/lib/zstd.h"
-+#include <zstd.h>
-
- #include "include/buffer.h"
- #include "include/encoding.h"
-@@ -30,7 +30,13 @@ class ZstdCompressor : public Compressor
-
- int compress(const bufferlist &src, bufferlist &dst) override {
- ZSTD_CStream *s = ZSTD_createCStream();
-- ZSTD_initCStream_srcSize(s, COMPRESSION_LEVEL, src.length());
-+
-+ // ZSTD_initCStream_srcSize(s, COMPRESSION_LEVEL, src.length());
-+ ZSTD_CCtx_reset(s, ZSTD_reset_session_only);
-+ ZSTD_CCtx_refCDict(s, NULL); // clear the dictionary (if any)
-+ ZSTD_CCtx_setParameter(s, ZSTD_c_compressionLevel, COMPRESSION_LEVEL);
-+ ZSTD_CCtx_setPledgedSrcSize(s, src.length());
-+
- auto p = src.begin();
- size_t left = src.length();
-
-@@ -48,7 +54,7 @@ class ZstdCompressor : public Compressor
- inbuf.size = p.get_ptr_and_advance(left, (const char**)&inbuf.src);
- left -= inbuf.size;
- ZSTD_EndDirective const zed = (left==0) ? ZSTD_e_end : ZSTD_e_continue;
-- size_t r = ZSTD_compress_generic(s, &outbuf, &inbuf, zed);
-+ size_t r = ZSTD_compressStream2(s, &outbuf, &inbuf, zed);
- if (ZSTD_isError(r)) {
- return -EINVAL;
- }
Copied: ceph/repos/community-testing-x86_64/use-system-zstd-and-fix-zstd-1.4.0-compatbility.patch (from rev 548519, ceph/trunk/use-system-zstd-and-fix-zstd-1.4.0-compatbility.patch)
===================================================================
--- use-system-zstd-and-fix-zstd-1.4.0-compatbility.patch (rev 0)
+++ use-system-zstd-and-fix-zstd-1.4.0-compatbility.patch 2020-01-04 23:17:52 UTC (rev 548520)
@@ -0,0 +1,35 @@
+--- a/src/compressor/zstd/ZstdCompressor.h 2019-04-25 20:15:48.000000000 +0200
++++ b/src/compressor/zstd/ZstdCompressor.h 2019-07-17 19:11:33.177014923 +0200
+@@ -16,7 +16,7 @@
+ #define CEPH_ZSTDCOMPRESSOR_H
+
+ #define ZSTD_STATIC_LINKING_ONLY
+-#include "zstd/lib/zstd.h"
++#include <zstd.h>
+
+ #include "include/buffer.h"
+ #include "include/encoding.h"
+@@ -30,7 +30,13 @@ class ZstdCompressor : public Compressor
+
+ int compress(const bufferlist &src, bufferlist &dst) override {
+ ZSTD_CStream *s = ZSTD_createCStream();
+- ZSTD_initCStream_srcSize(s, COMPRESSION_LEVEL, src.length());
++
++ // ZSTD_initCStream_srcSize(s, COMPRESSION_LEVEL, src.length());
++ ZSTD_CCtx_reset(s, ZSTD_reset_session_only);
++ ZSTD_CCtx_refCDict(s, NULL); // clear the dictionary (if any)
++ ZSTD_CCtx_setParameter(s, ZSTD_c_compressionLevel, COMPRESSION_LEVEL);
++ ZSTD_CCtx_setPledgedSrcSize(s, src.length());
++
+ auto p = src.begin();
+ size_t left = src.length();
+
+@@ -48,7 +54,7 @@ class ZstdCompressor : public Compressor
+ inbuf.size = p.get_ptr_and_advance(left, (const char**)&inbuf.src);
+ left -= inbuf.size;
+ ZSTD_EndDirective const zed = (left==0) ? ZSTD_e_end : ZSTD_e_continue;
+- size_t r = ZSTD_compress_generic(s, &outbuf, &inbuf, zed);
++ size_t r = ZSTD_compressStream2(s, &outbuf, &inbuf, zed);
+ if (ZSTD_isError(r)) {
+ return -EINVAL;
+ }
Deleted: use-threadsafe-death-tests-objectstore-memstore.patch
===================================================================
--- use-threadsafe-death-tests-objectstore-memstore.patch 2020-01-04 23:17:40 UTC (rev 548519)
+++ use-threadsafe-death-tests-objectstore-memstore.patch 2020-01-04 23:17:52 UTC (rev 548520)
@@ -1,10 +0,0 @@
---- a/src/test/test_objectstore_memstore.sh 2019-04-25 20:15:48.000000000 +0200
-+++ b/src/test/test_objectstore_memstore.sh 2019-07-14 21:18:32.845040824 +0200
-@@ -1,6 +1,6 @@
- #!/bin/sh -ex
-
- rm -rf memstore.test_temp_dir
--ceph_test_objectstore --gtest_filter=\*/0
-+ceph_test_objectstore --gtest_filter=\*/0 --gtest_death_test_style=threadsafe
-
- echo OK
Copied: ceph/repos/community-testing-x86_64/use-threadsafe-death-tests-objectstore-memstore.patch (from rev 548519, ceph/trunk/use-threadsafe-death-tests-objectstore-memstore.patch)
===================================================================
--- use-threadsafe-death-tests-objectstore-memstore.patch (rev 0)
+++ use-threadsafe-death-tests-objectstore-memstore.patch 2020-01-04 23:17:52 UTC (rev 548520)
@@ -0,0 +1,10 @@
+--- a/src/test/test_objectstore_memstore.sh 2019-04-25 20:15:48.000000000 +0200
++++ b/src/test/test_objectstore_memstore.sh 2019-07-14 21:18:32.845040824 +0200
+@@ -1,6 +1,6 @@
+ #!/bin/sh -ex
+
+ rm -rf memstore.test_temp_dir
+-ceph_test_objectstore --gtest_filter=\*/0
++ceph_test_objectstore --gtest_filter=\*/0 --gtest_death_test_style=threadsafe
+
+ echo OK
More information about the arch-commits
mailing list