Merged update from upstream sources

This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/booth.git#f47046a5aff476c4c2fda02b9fe78f41dd0cd530
2020-11-02 16:47:15 +01:00 · 2020-11-02 16:47:15 +01:00 · c759e509c5
parent 669f86a80f
commit c759e509c5
8 changed files with 464 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,6 @@
+/booth-*.tar.gz
+/booth-*.rpm
+/booth-*/
+
+*~
+*.sw?
--- a/booth.rpmlintrc
+++ b/booth.rpmlintrc
@ -0,0 +1,20 @@
+# no-documentation is fine for booth-arbitrator and booth (virtual package)
+addFilter(r'booth-arbitrator\.[^:]+: W: no-documentation')
+addFilter(r'booth\.[^:]+: W: no-documentation')
+
+# permissions for chroot
+addFilter(r'booth-core\.[^:]+: (E|W): non-standard-dir-perm /var/lib/booth 750')
+addFilter(r'booth-core\.[^:]+: (E|W): non-standard-dir-perm /var/lib/booth/cores 750')
+
+# booth is just metapackage
+addFilter(r'booth\.[^:]+: (W|E): no-binary')
+
+# booth-(site|test) installs just scripts in /usr/lib
+addFilter(r'booth-(site|test)\.[^:]+: (W|E): only-non-binary-in-usr-lib')
+
+# dangling symlink is ok for geostore and boothd (they actually points to booth binary)
+addFilter(r'booth-site\.[^:]+: (W|E): dangling-symlink /usr/sbin/geostore /usr/sbin/boothd')
+addFilter(r'booth-test\.[^:]+: (W|E): dangling-symlink /usr/share/booth/tests/src/boothd /usr/sbin/boothd')
+
+# booth unit test is distributed non-executable by upstream
+addFilter(r'booth-test\.[^:]+: (W|E): non-executable-script /usr/share/booth/tests/unit-test.py')
--- a/booth.spec
+++ b/booth.spec
@ -0,0 +1,404 @@
+# RPMs are split as follows:
+# * booth:
+#   - envelope package serving as a syntactic shortcut to install
+#     booth-site (with architecture reliably preserved)
+# * booth-core:
+#   - package serving as a base for booth-{arbitrator,site},
+#     carrying also basic documentation, license, etc.
+# * booth-arbitrator:
+#   - package to be installed at a machine accessible within HA cluster(s),
+#     but not (necessarily) a member of any, hence no dependency
+#     on anything from cluster stack is required
+# * booth-site:
+#   - package to be installed at a cluster member node
+#     (requires working cluster environment to be useful)
+# * booth-test:
+#   - files for testing booth
+#
+# TODO:
+# wireshark-dissector.lua currently of no use (rhbz#1259623), but if/when
+# this no longer persists, add -wireshark package (akin to libvirt-wireshark)
+
+%bcond_with html_man
+%bcond_with glue
+%bcond_with run_build_tests
+
+# set following to the result of  `git describe --abbrev=128 $commit`
+# This will be used to fill booth_ver, booth_numcomm and booth_sha1.
+# It is important to keep abbrev to get full length sha1! When updating source use
+# `spectool -g booth.spec` to download source.
+%global git_describe_str v1.0-237-gdd88847c8e7c55f18ace774cf70545aa137bd296
+
+# Set this to 1 when rebasing (changing git_describe_str) and increase otherwise
+%global release 2
+
+# Run shell script to parse git_describe str into version, numcomm and sha1 hash
+%global booth_ver %(s=%{git_describe_str}; vver=${s%%%%-*}; echo ${vver:1})
+%global booth_numcomm %(s=%{git_describe_str}; t=${s#*-}; echo ${t%%%%-*})
+%global booth_sha1 %(s=%{git_describe_str}; t=${s##*-}; echo ${t:1})
+%global booth_short_sha1 %(s=%{booth_sha1}; echo ${s:0:7})
+%global booth_archive_name %{name}-%{booth_ver}-%{booth_numcomm}-%{booth_short_sha1}
+
+## User and group to use for nonprivileged services (should be in sync with pacemaker)
+%global uname hacluster
+%global gname haclient
+
+# Disable automatic compilation of Python files in extra directories
+%global _python_bytecompile_extra 0
+
+%global github_owner ClusterLabs
+
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}}
+# https://fedoraproject.org/wiki/EPEL:Packaging?rd=Packaging:EPEL#The_.25license_tag
+%{!?_licensedir:%global license %doc}
+
+%global test_path   %{_datadir}/booth/tests
+
+Name:           booth
+Version:        %{booth_ver}
+Release:        %{booth_numcomm}.%{release}.%{booth_short_sha1}.git%{?dist}
+Summary:        Ticket Manager for Multi-site Clusters
+License:        GPLv2+
+Url:            https://github.com/%{github_owner}/%{name}
+Source0:        https://github.com/%{github_owner}/%{name}/archive/%{booth_short_sha1}/%{booth_archive_name}.tar.gz
+
+# direct build process dependencies
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  coreutils
+BuildRequires:  make
+## ./autogen.sh
+BuildRequires:  /bin/sh
+# general build dependencies
+BuildRequires:  asciidoctor
+BuildRequires:  gcc
+BuildRequires:  pkgconfig
+# linking dependencies
+BuildRequires:  libgcrypt-devel
+BuildRequires:  libxml2-devel
+## just for <pacemaker/crm/services.h> include
+BuildRequires:  pacemaker-libs-devel
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  zlib-devel
+## logging provider
+BuildRequires:  pkgconfig(libqb)
+## random2range provider
+BuildRequires:  pkgconfig(glib-2.0)
+## nametag provider
+BuildRequires:  pkgconfig(libsystemd)
+# check scriptlet (for hostname and killall respectively)
+BuildRequires:  hostname psmisc
+BuildRequires:  python3-devel
+# For generating tests
+BuildRequires:  sed
+# spec file specifics
+## for _unitdir, systemd_requires and specific scriptlet macros
+BuildRequires:  systemd
+## for autosetup
+BuildRequires:  git
+%if 0%{?with_run_build_tests}
+# check scriptlet (for perl and ss)
+BuildRequires:  perl-interpreter iproute
+%endif
+
+# this is for a composite-requiring-its-components arranged
+# as an empty package (empty files section) requiring subpackages
+# (_isa so as to preserve the architecture)
+Requires:       %{name}-core%{?_isa}
+Requires:       %{name}-site
+%files
+# intentionally empty
+
+%description
+Booth manages tickets which authorize cluster sites located
+in geographically dispersed locations to run resources.
+It facilitates support of geographically distributed
+clustering in Pacemaker.
+
+# SUBPACKAGES #
+
+%package        core
+Summary:        Booth core files (executables, etc.)
+# for booth-keygen (chown, dd)
+Requires:       coreutils
+# deal with pre-split arrangement
+Conflicts:      %{name} < 1.0-1
+
+%description    core
+Core files (executables, etc.) for Booth, ticket manager for
+multi-site clusters.
+
+%package        arbitrator
+Summary:        Booth support for running as an arbitrator
+BuildArch:      noarch
+Requires:       %{name}-core = %{version}-%{release}
+%{?systemd_requires}
+# deal with pre-split arrangement
+Conflicts:      %{name} < 1.0-1
+
+%description    arbitrator
+Support for running Booth, ticket manager for multi-site clusters,
+as an arbitrator.
+
+%post arbitrator
+%systemd_post booth@.service booth-arbitrator.service
+
+%preun arbitrator
+%systemd_preun booth@.service booth-arbitrator.service
+
+%postun arbitrator
+%systemd_postun_with_restart booth@.service booth-arbitrator.service
+
+%package        site
+Summary:        Booth support for running as a full-fledged site
+BuildArch:      noarch
+Requires:       %{name}-core = %{version}-%{release}
+# for crm_{resource,simulate,ticket} utilities
+Requires:       pacemaker >= 1.1.8
+# for ocf-shellfuncs and other parts of OCF shell-based environment
+Requires:       resource-agents
+# deal with pre-split arrangement
+Conflicts:      %{name} < 1.0-1
+
+%description    site
+Support for running Booth, ticket manager for multi-site clusters,
+as a full-fledged site.
+
+%package        test
+Summary:        Test scripts for Booth
+BuildArch:      noarch
+# runtests.py suite (for hostname and killall respectively)
+Requires:       hostname psmisc
+# any of the following internal dependencies will pull -core package
+## for booth@booth.service
+Requires:       %{name}-arbitrator = %{version}-%{release}
+## for booth-site and service-runnable scripts
+## (and /usr/lib/ocf/resource.d/booth)
+Requires:       %{name}-site = %{version}-%{release}
+Requires:       gdb
+Requires:       %{__python3}
+Requires:       python3-pexpect
+# runtests.py suite (for perl and ss)
+Requires:       perl-interpreter iproute
+
+%description    test
+Automated tests for running Booth, ticket manager for multi-site clusters.
+
+# BUILD #
+
+%prep
+%autosetup -n %{name}-%{booth_sha1} -S git_am
+
+%build
+./autogen.sh
+%{configure} \
+        --with-initddir=%{_initrddir} \
+        --docdir=%{_pkgdocdir} \
+        --enable-user-flags \
+        %{?with_html_man:--with-html_man} \
+        %{!?with_glue:--without-glue} \
+        PYTHON=%{__python3}
+%{make_build}
+
+%install
+%{make_install}
+mkdir -p %{buildroot}/%{_unitdir}
+cp -a -t %{buildroot}/%{_unitdir} \
+        -- conf/booth@.service conf/booth-arbitrator.service
+install -D -m 644 -t %{buildroot}/%{_mandir}/man8 \
+        -- docs/boothd.8
+ln -s boothd.8 %{buildroot}/%{_mandir}/man8/booth.8
+cp -a -t %{buildroot}/%{_pkgdocdir} \
+        -- ChangeLog README-testing conf/booth.conf.example
+# drop what we don't package anyway (COPYING added via tarball-relative path)
+rm -rf %{buildroot}/%{_initrddir}/booth-arbitrator
+rm -rf %{buildroot}/%{_pkgdocdir}/README.upgrade-from-v0.1
+rm -rf %{buildroot}/%{_pkgdocdir}/COPYING
+# tests
+mkdir -p %{buildroot}/%{test_path}
+# Copy tests from tarball
+cp -a -t %{buildroot}/%{test_path} \
+        -- conf test unit-tests script/unit-test.py
+chmod +x %{buildroot}/%{test_path}/test/booth_path
+chmod +x %{buildroot}/%{test_path}/test/live_test.sh
+mkdir -p %{buildroot}/%{test_path}/src
+ln -s -t %{buildroot}/%{test_path}/src \
+        -- %{_sbindir}/boothd
+# Generate runtests.py and boothtestenv.py
+sed -e 's#PYTHON_SHEBANG#%{__python3} -Es#g' \
+    -e 's#TEST_SRC_DIR#%{test_path}/test#g' \
+    -e 's#TEST_BUILD_DIR#%{test_path}/test#g' \
+    %{buildroot}/%{test_path}/test/runtests.py.in > %{buildroot}/%{test_path}/test/runtests.py
+
+chmod +x %{buildroot}/%{test_path}/test/runtests.py
+
+sed -e 's#PYTHON_SHEBANG#%{__python3} -Es#g' \
+    -e 's#TEST_SRC_DIR#%{test_path}/test#g' \
+    -e 's#TEST_BUILD_DIR#%{test_path}/test#g' \
+    %{buildroot}/%{test_path}/test/boothtestenv.py.in > %{buildroot}/%{test_path}/test/boothtestenv.py
+
+# https://fedoraproject.org/wiki/Packaging:Python_Appendix#Manual_byte_compilation
+%py_byte_compile %{__python3} %{buildroot}/%{test_path}
+
+%check
+# alternatively: test/runtests.py
+%if 0%{?with_run_build_tests}
+VERBOSE=1 make check
+%endif
+
+%files          core
+%license COPYING
+%doc %{_pkgdocdir}/AUTHORS
+%doc %{_pkgdocdir}/ChangeLog
+%doc %{_pkgdocdir}/README
+%doc %{_pkgdocdir}/booth.conf.example
+# core command(s) + man pages
+%{_sbindir}/booth*
+%{_mandir}/man8/booth*.8*
+# configuration
+%dir %{_sysconfdir}/booth
+%exclude %{_sysconfdir}/booth/booth.conf.example
+
+%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/booth/
+%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/booth/cores
+
+# Generated html docs
+%if 0%{?with_html_man}
+%{_pkgdocdir}/booth-keygen.8.html
+%{_pkgdocdir}/boothd.8.html
+%endif
+
+%files          arbitrator
+%{_unitdir}/booth@.service
+%{_unitdir}/booth-arbitrator.service
+
+%files          site
+# OCF (agent + a helper)
+## /usr/lib/ocf/resource.d/pacemaker provided by pacemaker
+%{_usr}/lib/ocf/resource.d/pacemaker/booth-site
+%dir %{_usr}/lib/ocf/lib/booth
+     %{_usr}/lib/ocf/lib/booth/geo_attr.sh
+# geostore (command + OCF agent)
+%{_sbindir}/geostore
+%{_mandir}/man8/geostore.8*
+## /usr/lib/ocf/resource.d provided by resource-agents
+%dir %{_usr}/lib/ocf/resource.d/booth
+     %{_usr}/lib/ocf/resource.d/booth/geostore
+# helper (possibly used in the configuration hook)
+%dir %{_datadir}/booth
+     %{_datadir}/booth/service-runnable
+
+# Generated html docs
+%if 0%{?with_html_man}
+%{_pkgdocdir}/geostore.8.html
+%endif
+
+%files          test
+%doc %{_pkgdocdir}/README-testing
+# /usr/share/booth provided by -site
+%{test_path}
+# /usr/lib/ocf/resource.d/booth provided by -site
+%{_usr}/lib/ocf/resource.d/booth/sharedrsc
+
+%changelog
+* Thu Oct 15 2020 Jan Friesse <jfriesse@redhat.com> - 1.0-237.2.dd88847.git
+- Fix dist macro
+
+* Thu Oct 15 2020 Jan Friesse <jfriesse@redhat.com> - 1.0-237.1.dd88847.git
+- Rebase to newest upstream snapshot
+
+* Thu Oct 15 2020 Jan Friesse <jfriesse@redhat.com> - 1.0-199.1.ac1d34c.git
+- Implement new versioning scheme
+
+* Tue Sep 29 2020 Jan Friesse <jfriesse@redhat.com> - 1.0-6.ac1d34c.git.5
+- Remove net-tools (netstat) dependency and replace it with iproute (ss)
+- Disable running tests during build by default (conditional run_build_tests)
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-6.ac1d34c.git.4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jun 3 2020 Jan Friesse <jfriesse@redhat.com> - 1.0-6.ac1d34c.git.3
+- Do not link with the pcmk libraries
+- Generate runtests.py and boothtestenv.py with -Es as make check does
+
+* Tue Jun 2 2020 Jan Friesse <jfriesse@redhat.com> - 1.0-6.ac1d34c.git.2
+- Require the Python interpreter directly instead of using the package name
+
+* Tue Jun 2 2020 Jan Friesse <jfriesse@redhat.com> - 1.0-6.ac1d34c.git.1
+- Update to current snapshot (commit ac1d34c) to fix test suite
+
+* Mon Jun 1 2020 Jan Friesse <jfriesse@redhat.com> - 1.0-5.385cc25.git.3
+- Add CI tests
+- Enable gating
+- Fix hardcoded-library-path
+
+* Mon Jun 1 2020 Jan Friesse <jfriesse@redhat.com> - 1.0-5.385cc25.git.2
+- Package /var/lib/booth where booth can chroot
+
+* Thu May 28 2020 Jan Friesse <jfriesse@redhat.com> - 1.0-5.385cc25.git.1
+- Fix test subpackage generating
+
+* Wed May 27 2020 Jan Friesse <jfriesse@redhat.com> - 1.0-5.385cc25.git
+- Update to current snapshot (commit 385cc25) to fix build warnings
+
+* Wed May 13 2020 Jan Friesse <jfriesse@redhat.com> - 1.0-4.5d837d2.git.2
+- Rebuild for the new libqb
+
+* Mon May 4 2020 Jan Friesse <jfriesse@redhat.com> - 1.0-4.5d837d2.git.1
+- Add '?dist' macro to release field
+
+* Mon May 4 2020 Jan Friesse <jfriesse@redhat.com> - 1.0-4.5d837d2.git
+- Update to current snapshot (commit 5d837d2) to build with gcc10
+- Pass full path of Python3 to configure
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-3.f2d38ce.git.3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-3.f2d38ce.git.2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-3.f2d38ce.git.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Jan Pokorný <jpokorny+rpm-booth@fedoraproject.org> - 1.0-3.f2d38ce.git
+- update for another, current snapshot beyond booth-1.0
+  (commit f2d38ce), including:
+  . support for solely manually managed tickets (9a365f9)
+  . use asciidoctor instead of asciidoc for generating man pages (65e6a6b)
+- switch to using Python 3 for the tests instead of Python 2
+  (behind unversioned "python" references; rhbz#1555651)
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-2.570876d.git.6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-2.570876d.git.5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-2.570876d.git.4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-2.570876d.git.3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-2.570876d.git.2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-2.570876d.git.1
+- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
+
+* Wed May 25 2016 Jan Pokorný <jpokorny+rpm-booth@fedoraproject.org> - 1.0-3.570876d.git
+- update per the changesets recently accepted by the upstream
+  (memory/resource leaks fixes, patches previously attached separately
+  that make unit test pass, internal cleanups, etc.)
+
+* Thu May 05 2016 Jan Pokorný <jpokorny+rpm-booth@fedoraproject.org> - 1.0-2.eb4256a.git
+- update a subset of out-of-tree patches per
+  https://github.com/ClusterLabs/booth/pull/22#issuecomment-216936987
+- pre-inclusion cleanups in the spec (apply systemd scriptlet operations
+  with booth-arbitrator, avoid overloading file implicitly considered %%doc
+  as %%license)
+  Resolves: rhbz#1314865
+  Related: rhbz#1333509
+
+* Thu Apr 28 2016 Jan Pokorný <jpokorny+rpm-booth@fedoraproject.org> - 1.0-1.eb4256a.git
+- initial build
--- a/gating.yaml
+++ b/gating.yaml
@ -0,0 +1,15 @@
+--- !Policy
+product_versions:
+  - fedora-*
+decision_context: bodhi_update_push_testing
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
+
+--- !Policy
+product_versions:
+  - fedora-*
+decision_context: bodhi_update_push_stable
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
--- a/1
+++ b/1
@ -0,0 +1 @@
+SHA512 (booth-1.0-237-dd88847.tar.gz) = 889e67b3ce0d35800030f289eb9bca6d282ed75ab4def44910e35a1aa7b1bd9b1ccc65347222206542e1f7f49814a84e22e46dc004a0b19634a91954b0f89f88
--- a/tests/.gitignore
+++ b/tests/.gitignore
@ -0,0 +1,3 @@
+# Ignore tests runs/artefacts.
+artifacts/**
+**/*.retry
--- a/tests/tests.yml
+++ b/tests/tests.yml
@ -0,0 +1,9 @@
+- hosts: localhost
+  roles:
+  - role: standard-test-basic
+    tags:
+    - classic
+    tests:
+    - upstream
+    required_packages:
+    - booth-test
--- a/tests/upstream/runtest.sh
+++ b/tests/upstream/runtest.sh
@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -xe
+set -o pipefail
+
+/usr/share/booth/tests/test/runtests.py --allow-root-user
				`@ -0,0 +1 @@`
				`SHA512 (booth-1.0-237-dd88847.tar.gz) = 889e67b3ce0d35800030f289eb9bca6d282ed75ab4def44910e35a1aa7b1bd9b1ccc65347222206542e1f7f49814a84e22e46dc004a0b19634a91954b0f89f88`