From b82abfd36de50e80aa59de98793444b59d933c9a Mon Sep 17 00:00:00 2001 From: Miroslav Lisik Date: Mon, 16 Aug 2021 20:52:04 +0200 Subject: [PATCH] Resolves: rhbz#1983359 - Rebased to latest upstream sources (see CHANGELOG.md) - Updated pcs-web-ui - Bundle rubygem-sinatra, rubygem-thin and their dependencies because they were orphaned --- .gitignore | 12 ++ pcs.spec | 296 +++++++++++++++++++++++++++++++----------------- sources | 15 ++- tests/tests.yml | 22 +++- 4 files changed, 230 insertions(+), 115 deletions(-) diff --git a/.gitignore b/.gitignore index 73d10a8..c25ef80 100644 --- a/.gitignore +++ b/.gitignore @@ -79,3 +79,15 @@ /pcs-0.10.8.tar.gz /pcs-web-ui-0.1.5.tar.gz /pcs-web-ui-node-modules-0.1.5.tar.xz +/daemons-1.4.0.gem +/eventmachine-1.2.7.gem +/mustermann-1.1.1.gem +/rack-2.2.3.gem +/rack-protection-2.0.8.1.gem +/ruby2_keywords-0.0.5.gem +/sinatra-2.0.8.1.gem +/thin-1.8.1.gem +/tilt-2.0.10.gem +/pcs-0.10.9.tar.gz +/pcs-web-ui-0.1.6.tar.gz +/pcs-web-ui-node-modules-0.1.6-fips-fix.tar.xz diff --git a/pcs.spec b/pcs.spec index c825a66..3a69d42 100644 --- a/pcs.spec +++ b/pcs.spec @@ -1,57 +1,80 @@ Name: pcs -Version: 0.10.8 -Release: 4%{?dist} +Version: 0.10.9 +Release: 1%{?dist} +# https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuidelines/ # https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Good_Licenses # GPLv2: pcs -# MIT: ember, handlebars, jquery, jquery-ui -License: GPLv2 and MIT +# MIT: dacite, daemons, ember, handlebars, jquery, jquery-ui, mustermann, rack, +# rack-protection, sinatra, tilt +# (GPLv2 or Ruby): eventmachine +# (GPLv2 or Ruby) and BSD: thin +# (BSD or Ruby): ruby2_keywords + +License: GPLv2 and MIT and (GPLv2 or Ruby) and BSD and (BSD or Ruby) URL: https://github.com/ClusterLabs/pcs +Group: System Environment/Base Summary: Pacemaker Configuration System %global version_or_commit %{version} -# %%global version_or_commit 67591ed1487cb0aefa181fdfc166c8a66b55d25a +# %%global version_or_commit %%{version}.210-9862 %global pcs_source_name %{name}-%{version_or_commit} # ui_commit can be determined by hash, tag or branch -%global ui_commit 0.1.5 +%global ui_commit 0.1.6 +%global ui_modules_version 0.1.6-fips-fix %global ui_src_name pcs-web-ui-%{ui_commit} %global pcs_snmp_pkg_name pcs-snmp -%global pyagentx_version 0.4.pcs.2 +%global pyagentx_version 0.4.pcs.2 %global dacite_version 1.6.0 -# bundled libraries for old web-ui -%global ember_version 1.4.0 -%global jquery_version 1.9.1 -%global jquery_ui_version 1.10.1 -%global handlebars_version 1.2.1 +%global version_rubygem_daemons 1.4.0 +%global version_rubygem_eventmachine 1.2.7 +%global version_rubygem_mustermann 1.1.1 +%global version_rubygem_rack 2.2.3 +%global version_rubygem_rack_protection 2.0.8.1 +%global version_rubygem_ruby2_keywords 0.0.5 +%global version_rubygem_sinatra 2.0.8.1 +%global version_rubygem_thin 1.8.1 +%global version_rubygem_tilt 2.0.10 -# We do not use _libdir macro because upstream is not prepared for it. -# Pcs does not include binaries and thus it should live in /usr/lib. Tornado -# and gems include binaries and thus it should live in /usr/lib64. But the -# path to tornado/gems is hardcoded in pcs sources. Modify hard links in pcs -# sources is not the way since then rpmdiff complains that the same file has -# different content in different architectures. -%global pcs_libdir %{_prefix}/lib -%global bundled_src_dir pcs/bundled +# javascript bundled libraries for old web-ui +%global ember_version 1.4.0 +%global handlebars_version 1.2.1 +%global jquery_ui_version 1.12.1 +%global jquery_version 3.6.0 + +%global pcs_bundled_dir pcs_bundled %global pcsd_public_dir pcsd/public +%global rubygem_bundle_dir pcsd/vendor/bundle +%global rubygem_cache_dir %{rubygem_bundle_dir}/cache #part after last slash is recognized as filename in look-aside repository #desired name is achived by trick with hash anchor Source0: %{url}/archive/%{version_or_commit}/%{pcs_source_name}.tar.gz Source41: https://github.com/ondrejmular/pyagentx/archive/v%{pyagentx_version}/pyagentx-%{pyagentx_version}.tar.gz -Source44: https://github.com/konradhalas/dacite/archive/v%{dacite_version}/dacite-%{dacite_version}.tar.gz +Source42: https://github.com/konradhalas/dacite/archive/v%{dacite_version}/dacite-%{dacite_version}.tar.gz + +Source81: https://rubygems.org/downloads/daemons-%{version_rubygem_daemons}.gem +Source82: https://rubygems.org/downloads/eventmachine-%{version_rubygem_eventmachine}.gem +Source83: https://rubygems.org/downloads/mustermann-%{version_rubygem_mustermann}.gem +Source84: https://rubygems.org/downloads/rack-%{version_rubygem_rack}.gem +Source85: https://rubygems.org/downloads/rack-protection-%{version_rubygem_rack_protection}.gem +Source86: https://rubygems.org/downloads/ruby2_keywords-%{version_rubygem_ruby2_keywords}.gem +Source87: https://rubygems.org/downloads/sinatra-%{version_rubygem_sinatra}.gem +Source88: https://rubygems.org/downloads/thin-%{version_rubygem_thin}.gem +Source89: https://rubygems.org/downloads/tilt-%{version_rubygem_tilt}.gem Source100: https://github.com/idevat/pcs-web-ui/archive/%{ui_commit}/%{ui_src_name}.tar.gz -Source101: https://github.com/idevat/pcs-web-ui/releases/download/%{ui_commit}/pcs-web-ui-node-modules-%{ui_commit}.tar.xz +Source101: https://github.com/idevat/pcs-web-ui/releases/download/%{ui_commit}/pcs-web-ui-node-modules-%{ui_modules_version}.tar.xz # Patch0: name.patch # git for patches -BuildRequires: make BuildRequires: git-core +BuildRequires: make #printf from coreutils is used in makefile BuildRequires: coreutils # python for pcs @@ -60,8 +83,16 @@ BuildRequires: python3-dateutil >= 2.7.0 BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: python3-pycurl +BuildRequires: python3-pip BuildRequires: python3-pyparsing BuildRequires: python3-tornado +BuildRequires: python3-cryptography +BuildRequires: python3-lxml +# for building bundled python packages +BuildRequires: python3-wheel +# for bundled python dateutil +BuildRequires: python3-setuptools_scm +BuildRequires: python3-distro # ruby and gems for pcsd BuildRequires: ruby >= 2.2.0 BuildRequires: ruby-devel @@ -70,24 +101,25 @@ BuildRequires: rubygem-ethon BuildRequires: rubygem-ffi BuildRequires: rubygem-io-console BuildRequires: rubygem-json +BuildRequires: rubygem-mustermann BuildRequires: rubygem-open4 -BuildRequires: rubygem-rack -BuildRequires: rubygem-rack-protection BuildRequires: rubygem-rack-test %if 0%{?fedora} >= 34 || 0%{?eln} || 0%{?rhel} >= 9 BuildRequires: rubygem(rexml) +BuildRequires: rubygem(webrick) %endif -BuildRequires: rubygem-sinatra -BuildRequires: rubygem-tilt # ruby libraries for tests BuildRequires: rubygem-test-unit +# for bundled rubygems +BuildRequires: rubygems +BuildRequires: rubygem-bundler +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: openssl # for touching patch files (sanitization function) BuildRequires: diffstat # for post, preun and postun macros BuildRequires: systemd -# for tests -BuildRequires: python3-lxml -BuildRequires: python3-pyOpenSSL # pcsd fonts and font management tools for creating symlinks to fonts BuildRequires: fontconfig BuildRequires: liberation-sans-fonts @@ -96,8 +128,18 @@ BuildRequires: overpass-fonts # for building web ui BuildRequires: npm +# cluster stack packages for pkg-config +BuildRequires: booth +BuildRequires: corosync-qdevice-devel +BuildRequires: corosynclib-devel >= 3.0 +BuildRequires: fence-agents-common +BuildRequires: pacemaker-libs-devel >= 2.0.0 +BuildRequires: resource-agents +BuildRequires: sbd + # python and libraries for pcs, setuptools for pcs entrypoint Requires: python3 >= 3.6 +Requires: python3-cryptography Requires: python3-dateutil >= 2.7.0 Requires: python3-lxml Requires: python3-setuptools @@ -111,25 +153,16 @@ Requires: rubygem-ethon Requires: rubygem-ffi Requires: rubygem-json Requires: rubygem-open4 -Requires: rubygem-rack -Requires: rubygem-rack-protection Requires: rubygem-rack-test %if 0%{?fedora} >= 34 || 0%{?eln} || 0%{?rhel} >= 9 Requires: rubygem(rexml) Requires: rubygem(webrick) %endif -Requires: rubygem-sinatra -Requires: rubygem-tilt # ruby and gems for pcsd-ruby -Requires: rubygem-daemons -Requires: rubygem-eventmachine -Requires: rubygem-thin # for killall Requires: psmisc -# for working with certificates (validation etc.) -Requires: openssl -Requires: python3-pyOpenSSL # cluster stack and related packages +Requires: pcmk-cluster-manager >= 2.0.0 Suggests: pacemaker Requires: (corosync >= 2.99 if pacemaker) # pcs enables corosync encryption by default so we require libknet1-plugins-all @@ -145,8 +178,22 @@ Requires: pam # pcsd fonts Requires: liberation-sans-fonts Requires: overpass-fonts +# needs logrotate for /etc/logrotate.d/pcsd +Requires: logrotate Provides: bundled(dacite) = %{dacite_version} +# bundled rubygems +Provides: bundled(daemons) = %{version_rubygem_daemons} +Provides: bundled(eventmachine) = %{version_rubygem_eventmachine} +Provides: bundled(mustermann) = %{version_rubygem_mustermann} +Provides: bundled(rack) = %{version_rubygem_rack} +Provides: bundled(rack) = %{version_rubygem_rack} +Provides: bundled(rack-protection) = %{version_rubygem_rack_protection} +Provides: bundled(ruby2_keywords) = %{version_rubygem_ruby2_keywords} +Provides: bundled(sinatra) = %{version_rubygem_sinatra} +Provides: bundled(thin) = %{version_rubygem_thin} +Provides: bundled(tilt) = %{version_rubygem_tilt} +# javascript bundled libraries for old web-ui Provides: bundled(ember) = %{ember_version} Provides: bundled(handlebars) = %{handlebars_version} Provides: bundled(jquery) = %{jquery_version} @@ -158,6 +205,7 @@ easily view, modify and create pacemaker based clusters. # pcs-snmp package definition %package -n %{pcs_snmp_pkg_name} +Group: System Environment/Base Summary: Pacemaker cluster SNMP agent # https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Good_Licenses # GPLv2: pcs @@ -196,7 +244,11 @@ update_times(){ unset file_list[0] for fname in ${file_list[@]}; do - touch -r $reference_file $fname + # some files could be deleted by a patch therefore we test file for + # existance before touch to avoid exit with error: No such file or + # directory + # diffstat cannot create list of files without deleted files + test -e $fname && touch -r $reference_file $fname done } @@ -215,57 +267,90 @@ update_times_patch(){ update_times ${patch_file_name} `diffstat -p1 -l ${patch_file_name}` } -# update_times_patch %%{PATCH0} +# update_times_patch %{PATCH0} # prepare dirs/files necessary for building web ui # inside SOURCE100 is only directory %%{ui_src_name} tar -xzf %SOURCE100 -C %{pcsd_public_dir} tar -xf %SOURCE101 -C %{pcsd_public_dir}/%{ui_src_name} -# 3) dir for python bundles -mkdir -p %{bundled_src_dir} +# prepare dirs/files necessary for building all bundles +# ----------------------------------------------------- +# 1) rubygems sources -# 4) sources for pyagentx -tar -xzf %SOURCE41 -C %{bundled_src_dir} -mv %{bundled_src_dir}/pyagentx-%{pyagentx_version} %{bundled_src_dir}/pyagentx -update_times %SOURCE41 `find %{bundled_src_dir}/pyagentx -follow` -cp %{bundled_src_dir}/pyagentx/LICENSE.txt pyagentx_LICENSE.txt -cp %{bundled_src_dir}/pyagentx/CONTRIBUTORS.txt pyagentx_CONTRIBUTORS.txt -cp %{bundled_src_dir}/pyagentx/README.md pyagentx_README.md +mkdir -p %{rubygem_cache_dir} +cp -f %SOURCE81 %{rubygem_cache_dir} +cp -f %SOURCE82 %{rubygem_cache_dir} +cp -f %SOURCE83 %{rubygem_cache_dir} +cp -f %SOURCE84 %{rubygem_cache_dir} +cp -f %SOURCE85 %{rubygem_cache_dir} +cp -f %SOURCE86 %{rubygem_cache_dir} +cp -f %SOURCE87 %{rubygem_cache_dir} +cp -f %SOURCE88 %{rubygem_cache_dir} +cp -f %SOURCE89 %{rubygem_cache_dir} +# For reason why we are renaming open4 rubygem, see comment of source +# definition above. -# 7) sources for python dacite -tar -xzf %SOURCE44 -C %{bundled_src_dir} -mv %{bundled_src_dir}/dacite-%{dacite_version} %{bundled_src_dir}/dacite -cp %{bundled_src_dir}/dacite/LICENSE dacite_LICENSE -cp %{bundled_src_dir}/dacite/README.md dacite_README.md +# 2) prepare python bundles +mkdir -p %{pcs_bundled_dir}/src +cp -f %SOURCE41 rpm/ +cp -f %SOURCE42 rpm/ %build %define debug_package %{nil} +./autogen.sh +%{configure} --enable-local-build --enable-use-local-cache-only --enable-individual-bundling PYTHON=%{__python3} +make all + %install rm -rf $RPM_BUILD_ROOT pwd +%make_install + # build web ui and put it to pcsd make -C %{pcsd_public_dir}/%{ui_src_name} build -mv %{pcsd_public_dir}/%{ui_src_name}/build pcsd/public/ui +mv %{pcsd_public_dir}/%{ui_src_name}/build ${RPM_BUILD_ROOT}%{_libdir}/%{pcsd_public_dir}/ui rm -r %{pcsd_public_dir}/%{ui_src_name} -# main pcs install -%make_install \ - PREFIX=%{_prefix} \ - SYSTEMD_UNIT_DIR=%{_unitdir} \ - LIB_DIR=%{pcs_libdir} \ - PYTHON=%{__python3} \ - PYTHON_SITELIB=%{python3_sitelib} \ - BASH_COMPLETION_DIR=%{_datadir}/bash-completion/completions \ - BUNDLE_PYAGENTX_SRC_DIR=`readlink -f %{bundled_src_dir}/pyagentx` \ - BUNDLE_DACITE_SRC_DIR=`readlink -f %{bundled_src_dir}/dacite` \ - BUILD_GEMS=false \ - SYSTEMCTL_OVERRIDE=true \ - hdrdir="%{_includedir}" \ - rubyhdrdir="%{_includedir}" \ - includedir="%{_includedir}" +# symlink favicon into pcsd directories +ln -fs /etc/favicon.png ${RPM_BUILD_ROOT}%{_libdir}/%{pcsd_public_dir}/images/favicon.png + +# prepare license files +# some rubygems do not have a license file (thin) +cp %{pcs_bundled_dir}/src/pyagentx-*/LICENSE.txt pyagentx_LICENSE.txt +cp %{pcs_bundled_dir}/src/pyagentx-*/CONTRIBUTORS.txt pyagentx_CONTRIBUTORS.txt +cp %{pcs_bundled_dir}/src/pyagentx-*/README.md pyagentx_README.md + +cp %{pcs_bundled_dir}/src/dacite-*/LICENSE dacite_LICENSE +cp %{pcs_bundled_dir}/src/dacite-*/README.md dacite_README.md + +mv %{rubygem_bundle_dir}/gems/daemons-%{version_rubygem_daemons}/LICENSE daemons_LICENSE +mv %{rubygem_bundle_dir}/gems/eventmachine-%{version_rubygem_eventmachine}/LICENSE eventmachine_LICENSE +mv %{rubygem_bundle_dir}/gems/eventmachine-%{version_rubygem_eventmachine}/GNU eventmachine_GNU +mv %{rubygem_bundle_dir}/gems/mustermann-%{version_rubygem_mustermann}/LICENSE mustermann_LICENSE +mv %{rubygem_bundle_dir}/gems/rack-%{version_rubygem_rack}/MIT-LICENSE rack_MIT-LICENSE +mv %{rubygem_bundle_dir}/gems/rack-protection-%{version_rubygem_rack_protection}/License rack-protection_License +mv %{rubygem_bundle_dir}/gems/ruby2_keywords-%{version_rubygem_ruby2_keywords}/LICENSE ruby2_keywords_LICENSE +mv %{rubygem_bundle_dir}/gems/sinatra-%{version_rubygem_sinatra}/LICENSE sinatra_LICENSE +mv %{rubygem_bundle_dir}/gems/tilt-%{version_rubygem_tilt}/COPYING tilt_COPYING + +# We are not building debug package for pcs but we need to add MiniDebuginfo +# to the bundled shared libraries from rubygem extensions in order to satisfy +# rpmdiff's binary stripping checker. +# Therefore we call find-debuginfo.sh script manually in order to strip +# binaries and add MiniDebugInfo with .gnu_debugdata section +/usr/lib/rpm/find-debuginfo.sh -j2 -m -i -S debugsourcefiles.list +# find-debuginfo.sh generated some files into /usr/lib/debug and +# /usr/src/debug/ that we don't want in the package +rm -rf $RPM_BUILD_ROOT%{_libdir}/debug +rm -rf $RPM_BUILD_ROOT/usr/lib/debug +rm -rf $RPM_BUILD_ROOT%{_prefix}/src/debug + +# We can remove files required for gem compilation +rm -rf $RPM_BUILD_ROOT%{_libdir}/%{rubygem_bundle_dir}/gems/eventmachine-%{version_rubygem_eventmachine}/ext +rm -rf $RPM_BUILD_ROOT%{_libdir}/%{rubygem_bundle_dir}/gems/thin-%{version_rubygem_thin}/ext %check # In the building environment LC_CTYPE is set to C which causes tests to fail @@ -283,20 +368,17 @@ run_all_tests(){ # disabled tests: # - BUNDLED_LIB_LOCATION=$RPM_BUILD_ROOT%{pcs_libdir}/pcs/bundled/packages \ - %{__python3} pcs_test/suite.py --tier0 -v --vanilla --all-but \ - pcs_test.tier0.daemon.app.test_app_remote.SyncConfigMutualExclusive.test_get_not_locked \ - pcs_test.tier0.daemon.app.test_app_remote.SyncConfigMutualExclusive.test_post_not_locked \ + %{__python3} pcs_test/suite --tier0 -v --vanilla --all-but \ + pcs_test.tier0.daemon.app.test_app_remote.SyncConfigMutualExclusive.test_get_not_locked \ + pcs_test.tier0.daemon.app.test_app_remote.SyncConfigMutualExclusive.test_post_not_locked \ test_result_python=$? #run pcsd tests and remove them - pcsd_dir=$RPM_BUILD_ROOT%{pcs_libdir}/pcsd - # GEM_HOME is not needed anymore since all required gems are in fedora - ruby \ - -I${pcsd_dir} \ - -I${pcsd_dir}/test \ - ${pcsd_dir}/test/test_all_suite.rb + GEM_HOME=$RPM_BUILD_ROOT%{_libdir}/%{rubygem_bundle_dir} ruby \ + -I$RPM_BUILD_ROOT%{_libdir}/pcsd \ + -Ipcsd/test \ + pcsd/test/test_all_suite.rb test_result_ruby=$? if [ $test_result_python -ne 0 ]; then @@ -306,12 +388,8 @@ run_all_tests(){ } remove_all_tests() { - pcsd_dir=$RPM_BUILD_ROOT%{pcs_libdir}/pcsd - #remove pcsd tests, we do not distribute them in the rpm - rm -r -v ${pcsd_dir}/test - # remove javascript testing files - rm -r -v ${pcsd_dir}/public/js/dev + rm -r -v $RPM_BUILD_ROOT%{_libdir}/%{pcsd_public_dir}/js/dev } run_all_tests @@ -324,6 +402,7 @@ remove_all_tests %{_bindir}/systemctl daemon-reload %{_bindir}/systemctl try-restart pcsd.service + %post %systemd_post pcsd.service %systemd_post pcsd-ruby.service @@ -351,18 +430,24 @@ remove_all_tests %doc dacite_README.md %license dacite_LICENSE %license COPYING -%{python3_sitelib}/pcs -%{python3_sitelib}/pcs-%{version}-py3.*.egg-info +%license daemons_LICENSE +%license eventmachine_LICENSE +%license eventmachine_GNU +%license mustermann_LICENSE +%license rack_MIT-LICENSE +%license rack-protection_License +%license ruby2_keywords_LICENSE +%license sinatra_LICENSE +%{python3_sitelib}/* %{_sbindir}/pcs %{_sbindir}/pcsd -%{pcs_libdir}/pcs/pcs_internal -%{pcs_libdir}/pcsd/* -%{pcs_libdir}/pcs/bundled/packages/dacite* +%{_libdir}/pcs/* +%{_libdir}/pcsd/* %{_unitdir}/pcsd.service %{_unitdir}/pcsd-ruby.service %{_datadir}/bash-completion/completions/pcs %{_sharedstatedir}/pcsd -%{_sysconfdir}/pam.d/pcsd +%config(noreplace) %{_sysconfdir}/pam.d/pcsd %dir %{_var}/log/pcsd %config(noreplace) %{_sysconfdir}/logrotate.d/pcsd %config(noreplace) %{_sysconfdir}/sysconfig/pcsd @@ -375,22 +460,13 @@ remove_all_tests %ghost %config(noreplace) %attr(0644,root,root) %{_sharedstatedir}/pcsd/pcs_users.conf %{_mandir}/man8/pcs.* %{_mandir}/man8/pcsd.* -%exclude %{pcs_libdir}/pcsd/*.debian -%exclude %{pcs_libdir}/pcsd/Gemfile -%exclude %{pcs_libdir}/pcsd/Gemfile.lock -%exclude %{pcs_libdir}/pcsd/Makefile -%exclude %{pcs_libdir}/pcsd/pcsd.conf -%exclude %{pcs_libdir}/pcsd/pcsd.service -%exclude %{pcs_libdir}/pcsd/pcsd-ruby.service -%exclude %{pcs_libdir}/pcsd/pcsd.8 -%exclude %{pcs_libdir}/pcsd/public/js/dev/* -%exclude %{python3_sitelib}/pcs/bash_completion -%exclude %{python3_sitelib}/pcs/pcs.8 -%exclude %{python3_sitelib}/pcs/pcs +%exclude %{_libdir}/pcs/pcs_snmp_agent +%exclude %{_libdir}/pcs/%{pcs_bundled_dir}/packages/pyagentx* + %files -n %{pcs_snmp_pkg_name} -%{pcs_libdir}/pcs/pcs_snmp_agent -%{pcs_libdir}/pcs/bundled/packages/pyagentx* +%{_libdir}/pcs/pcs_snmp_agent +%{_libdir}/pcs/%{pcs_bundled_dir}/packages/pyagentx* %{_unitdir}/pcs_snmp_agent.service %{_datadir}/snmp/mibs/PCMK-PCS*-MIB.txt %{_mandir}/man8/pcs_snmp_agent.* @@ -402,6 +478,12 @@ remove_all_tests %license pyagentx_LICENSE.txt %changelog +* Mon Aug 16 2021 Miroslav Lisik - 0.10.9-1 +- Rebased to latest upstream sources (see CHANGELOG.md) +- Updated pcs-web-ui +- Bundle rubygem-sinatra, rubygem-thin and their dependencies because they were orphaned +- Resolves: rhbz#1983359 + * Thu Jul 22 2021 Fedora Release Engineering - 0.10.8-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index ccc5682..238305b 100644 --- a/sources +++ b/sources @@ -1,5 +1,14 @@ SHA512 (pyagentx-0.4.pcs.2.tar.gz) = d4194fec9a3e5fefe3793d49b7fec1feafef294c7e613a06046c2993daeefc5cb39d7c5b2b402ff83e49b2d976953f862264288c758c0be09d997b5323cc558a SHA512 (dacite-1.6.0.tar.gz) = 034255f095589d309fe5805413d8b148f430cd20a0de305b7954083b530d516da1d8f3f00ebb5264a8cfb77f2b2a76f1e2d863e78bd191f1d85021c5553815da -SHA512 (pcs-0.10.8.tar.gz) = 8b9ba62279431e481d062e804d24480d2a274d2f4897a82149df6116ff3df2394d97a3ee77a6dee4c563d915bab0142124a8942524fcc4e894912086e865353c -SHA512 (pcs-web-ui-0.1.5.tar.gz) = ec4adf8ca5858c1f1f82e8f58e36864805bedc6dc10674fab83498aff5422a0497703ecd96fda17b4c1f6beffa64fe5a80a82fb4f75b2102fe1a4753a5d057e9 -SHA512 (pcs-web-ui-node-modules-0.1.5.tar.xz) = cf1ef7e9280e7a0e864407e15f33edb98dce72e93d6917b74d5833ba184be248d87f6f309a2667bb2cbba0f33d1afde6a706832473505df87ed65835512da82c +SHA512 (daemons-1.4.0.gem) = 48510e9873c692c7060d99d9aab3215225f193373e91cb9121b08859afb3119a0a668838b9018807523889ecf23211f64e39540b3aa683f5c7dee7126e8c36a0 +SHA512 (eventmachine-1.2.7.gem) = fdbcf9fc933e2414e70f8f48153e9ba6ed7a0029cdf49cdcb4ab72ab26683e727a36c099f017f20681f9c361179461743e501278ca9bd5612e693e26867cc516 +SHA512 (mustermann-1.1.1.gem) = 55d5fd9b8309e0b806b2fb0af409fbc71b958b8f91116991439f2c66b1f71f17647a61020b0349a86132e7d3da383121719ea330538abb8f3c8bef5fbff0b747 +SHA512 (rack-2.2.3.gem) = aabda2ac4aeea6b119c5d570a6c36b5c114f879cc73678a6f385b71f2191501a86adc3bed6f0e0bacfc1e4c48c2374714588669ede898053dc7719899bf71635 +SHA512 (rack-protection-2.0.8.1.gem) = 264aef904d9ae1c38197ad4ad44f1638905bd180fc4bb402c47856c37168059e8e975ca2de5518b1e5cebf79b970024b7d9f5f8b8908880451357dea5e428562 +SHA512 (ruby2_keywords-0.0.5.gem) = f6b9078b111e68c0017e0025ecdccb976c7a32f35c1a8adf9fd879db0c91f89eb9bd799f9527a846e28056f2a5fbf0f3610cda9538570288c493613c35c83a6f +SHA512 (sinatra-2.0.8.1.gem) = a63c8bbf468d059ce1e545c4da72208db34ef677141540b31a24a82537c15bbc020c712b9d9eb49470af45b4ce27f65ab21191ee47ebae7c45b9bbd86600ea3e +SHA512 (thin-1.8.1.gem) = c200ea03b7876b2a17b5875557fa967b8d01db20cc401811f314f3285f8249b8793e4709b7bc033a9c5813b9a51e3093c55f717b4a98b8fda171aa82813b7419 +SHA512 (tilt-2.0.10.gem) = d2e0e1976da24ea4d8581d29a3ac2c0772c2e42f1cd04c48f1e3c1745a14d7cd319f14cead3e5341ec0f6c07aa216b50c29ad96984a85a9757ff9f7cc89b80df +SHA512 (pcs-0.10.9.tar.gz) = ced62db86f42427474b0ae97009f09bed0d0f4bae5ab1188fc58aace0b598863ac80ab443a8555b5d414f8332422144a3e1ef810ef46b9b3e1a5c8b2ef09985e +SHA512 (pcs-web-ui-0.1.6.tar.gz) = d5361155e943330d489fbc69442777a0c45d6fec12894a6b2158e0ad583d2fd2307a13615d39a770352c4c37473919b5e13c8d13e84cd4b778ac719de51c6c20 +SHA512 (pcs-web-ui-node-modules-0.1.6-fips-fix.tar.xz) = a209c3acac3a992627c146c75e9ebdbc735b38ba8f98935377694b8c13e4318ee5059c75833962cf188fc963ecefe68a6762daf7b4499c54538b1493cc0d712e diff --git a/tests/tests.yml b/tests/tests.yml index f4f86a0..174884c 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -18,7 +18,7 @@ - name: Start pcsd systemd: state: started - name: pcsd.service + name: pcsd daemon_reload: yes roles: @@ -30,16 +30,25 @@ - automake - make - rpm-build - - git + - ruby-devel + - git-core - booth-site - fence-agents-apc - fence-agents-ipmilan - fence-agents-scsi - fence-virt + - fontconfig + - openssl - pcs - pcs-snmp + - python3-pip + - python3-setuptools_scm + - python3-wheel + - rubygem-json + - rubygem-test-unit + - wget required_services: - - pcsd.service + - pcsd tests: # dir: . -> dot means tests dir in distgit - prepare-source: @@ -48,15 +57,18 @@ - flatten-source: dir: ./ run: shopt -s dotglob; mv {{tenv_workdir}}/source/*/* {{tenv_workdir}}/source + - build_sources: + dir: ./source + run: "export PYTHONPATH=/usr/lib64/pcs/pcs_bundled/packages/; export GEM_HOME=/usr/lib64/pcsd/vendor/bundle/; ./autogen.sh && ./configure" - remove_sources: dir: ./source run: rm -rfv pcs - run_upstream_tier0_tests: dir: ./source - run: pcs_test/suite.py --tier0 -v --vanilla --installed + run: pcs_test/suite --tier0 -v --vanilla --installed - run_upstream_tier1_tests: dir: ./source - run: pcs_test/suite.py --tier1 -v --vanilla --installed + run: pcs_test/suite --tier1 -v --vanilla --installed - run_smoke_tests: dir: ./source run: pcs_test/smoke.sh