diff --git a/_servicedata b/_servicedata index 98b70a1..acb3fb3 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,6 @@ git://github.com/ClusterLabs/pacemaker.git - 9146c3c20a22bee6ab6f2ad025e593551f0feaf8 + 7c466c913e7a386dd1c0ba563967ee58056b5817 \ No newline at end of file diff --git a/fate-323526_pacemaker-pacemaker-configure-AM_PATH_PYTHON-python3.patch b/fate-323526_pacemaker-pacemaker-configure-AM_PATH_PYTHON-python3.patch deleted file mode 100644 index efb4b0b..0000000 --- a/fate-323526_pacemaker-pacemaker-configure-AM_PATH_PYTHON-python3.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: pacemaker-1.1.18+20180112.bd7115b8c/configure.ac -=================================================================== ---- pacemaker-1.1.18+20180112.bd7115b8c.orig/configure.ac -+++ pacemaker-1.1.18+20180112.bd7115b8c/configure.ac -@@ -493,7 +493,7 @@ dnl Replacing AC_PROG_LIBTOOL with AC_CH - dnl was NOT being expanded all the time thus causing things to fail. - AC_CHECK_PROGS(LIBTOOL, glibtool libtool libtool15 libtool13) - --AM_PATH_PYTHON -+AM_PATH_PYTHON([3]) - AC_CHECK_PROGS(MAKE, gmake make) - AC_PATH_PROGS(HTML2TXT, lynx w3m) - AC_PATH_PROGS(HELP2MAN, help2man) diff --git a/fate-323526_pacemaker-tests-shebang-python3.patch b/fate-323526_pacemaker-tests-shebang-python3.patch index 8d9830f..ceb9cb7 100644 --- a/fate-323526_pacemaker-tests-shebang-python3.patch +++ b/fate-323526_pacemaker-tests-shebang-python3.patch @@ -1,7 +1,7 @@ -Index: pacemaker-1.1.18+20180101.494eacba4/cts/CIB.py +Index: pacemaker-1.1.18+20180129.c801ab11e/cts/CIB.py =================================================================== ---- pacemaker-1.1.18+20180101.494eacba4.orig/cts/CIB.py -+++ pacemaker-1.1.18+20180101.494eacba4/cts/CIB.py +--- pacemaker-1.1.18+20180129.c801ab11e.orig/cts/CIB.py ++++ pacemaker-1.1.18+20180129.c801ab11e/cts/CIB.py @@ -403,7 +403,7 @@ Description=Dummy resource that takes a [Service] @@ -11,71 +11,3 @@ Index: pacemaker-1.1.18+20180101.494eacba4/cts/CIB.py ExecStop=/bin/sh -c 'sleep 10; [ -n "\$MAINPID" ] && kill -s KILL \$MAINPID' """ -Index: pacemaker-1.1.18+20180101.494eacba4/cts/CTSlab.py -=================================================================== ---- pacemaker-1.1.18+20180101.494eacba4.orig/cts/CTSlab.py -+++ pacemaker-1.1.18+20180101.494eacba4/cts/CTSlab.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python3 - - '''CTS: Cluster Testing System: Lab environment module - ''' -Index: pacemaker-1.1.18+20180101.494eacba4/cts/OCFIPraTest.py -=================================================================== ---- pacemaker-1.1.18+20180101.494eacba4.orig/cts/OCFIPraTest.py -+++ pacemaker-1.1.18+20180101.494eacba4/cts/OCFIPraTest.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python3 - - '''OCF IPaddr/IPaddr2 Resource Agent Test''' - -Index: pacemaker-1.1.18+20180101.494eacba4/lrmd/regression.py.in -=================================================================== ---- pacemaker-1.1.18+20180101.494eacba4.orig/lrmd/regression.py.in -+++ pacemaker-1.1.18+20180101.494eacba4/lrmd/regression.py.in -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python3 - """ Regression tests for Pacemaker's lrmd - """ - -@@ -412,7 +412,7 @@ class Tests(object): - os.system("dd if=/dev/urandom of=/etc/pacemaker/authkey bs=4096 count=1") - - ### Make fake systemd daemon and unit file ### -- dummy_daemon = """#!/usr/bin/python -+ dummy_daemon = """#!/usr/bin/python3 - import time, systemd.daemon - time.sleep(3) - systemd.daemon.notify("READY=1") -@@ -432,7 +432,7 @@ description "Dummy service for regre - exec dd if=/dev/random of=/dev/null - """) - -- dummy_fence_sleep_agent = ("""#!/usr/bin/python -+ dummy_fence_sleep_agent = ("""#!/usr/bin/python3 - import sys - import time - def main(): -Index: pacemaker-1.1.18+20180101.494eacba4/fencing/fence_dummy -=================================================================== ---- pacemaker-1.1.18+20180101.494eacba4.orig/fencing/fence_dummy -+++ pacemaker-1.1.18+20180101.494eacba4/fencing/fence_dummy -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python3 - """Dummy fence agent for testing - """ - -Index: pacemaker-1.1.18+20180101.494eacba4/fencing/regression.py.in -=================================================================== ---- pacemaker-1.1.18+20180101.494eacba4.orig/fencing/regression.py.in -+++ pacemaker-1.1.18+20180101.494eacba4/fencing/regression.py.in -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python3 - """ Regression tests for Pacemaker's stonithd - """ - diff --git a/pacemaker-1.1.18+20180119.9146c3c20.tar.xz b/pacemaker-1.1.18+20180119.9146c3c20.tar.xz deleted file mode 100644 index 32e01ca..0000000 --- a/pacemaker-1.1.18+20180119.9146c3c20.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4fec817358a5d9f9bed986c2d676592941a2a6f0c702f99be9d36ebb92cf19a6 -size 3226164 diff --git a/pacemaker-1.1.18+20180209.7acb22379.tar.xz b/pacemaker-1.1.18+20180209.7acb22379.tar.xz new file mode 100644 index 0000000..e01f977 --- /dev/null +++ b/pacemaker-1.1.18+20180209.7acb22379.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f8a0d701992a590245ecc734f1f5417c274fddaaeb989401ee040c07a4b683b +size 3215796 diff --git a/pacemaker.changes b/pacemaker.changes index 7f6b23a..188c406 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,3 +1,51 @@ +------------------------------------------------------------------- +Sat Feb 10 06:43:16 UTC 2018 - ygao@suse.com + +- Update to version 1.1.18+20180209.7acb22379: +- use proper way to make output files executable +- spec: move lrmd_test to cli package +- spec: make log directories owned by cli package +- spec: move all test data into cts package +- pengine: move regression test to cts as cts-pengine +- lrmd: move regression test to cts as cts-lrmd +- fencing: move regression test to cts as cts-stonithd +- tools: move CLI regression test to cts as cts-cli +- rename top-level testing files and move to cts directory +- tools: drop crmadmin -i and -d options (fate#324508) + +------------------------------------------------------------------- +Fri Feb 9 00:05:41 UTC 2018 - ygao@suse.com + +- Update to version 1.1.18+20180208.f6a261987: +- Feature: crmd: modify feature set handling + +------------------------------------------------------------------- +Wed Feb 7 02:12:04 UTC 2018 - ygao@suse.com + +- Update to version 1.1.18+20180205.b44c57e35: +- pengine,doc,tools: rename "master score" to "promotion score" (fate#324508) +- libpe_status: rename bundle 'masters' to 'promoted-max' (fate#323415) +- pengine,libpe_status: rename master-{max,node-max} to promoted-* (fate#324508) +- various: merge clone resource type and master/slave resource type (fate#324508) +- attrd,pacemakerd,libcrmcommon: make "Exiting" last message +- don't use corosync logging settings (fate#324508) +- crmd,libpe_rules: drop support for notification-agent/recipient +- tools: improve crm_failcount exit code usage + +------------------------------------------------------------------- +Tue Jan 30 00:36:28 UTC 2018 - ygao@suse.com + +- Update to version 1.1.18+20180129.c801ab11e: +- allow configuring specific python intepreter version (fate#323526) + * Drop obsolete fate-323526_pacemaker-pacemaker-configure-AM_PATH_PYTHON-python3.patch + +- use auto-configured python executable in python shebangs (fate#323526) + * Update fate-323526_pacemaker-tests-shebang-python3.patch + +- xml: drop score-attribute and score-attribute-mangle +- pengine: avoid misuse of function parameter +- libcrmservice,pacemakerd: improve privilege dropping + ------------------------------------------------------------------- Sat Jan 20 02:40:06 UTC 2018 - ygao@suse.com @@ -154,7 +202,7 @@ Thu Nov 23 13:48:52 UTC 2017 - rbrown@suse.com %_fillupdir macro (boo#1069468) ------------------------------------------------------------------- -Mon Nov 20 16:20:53 UTC 2017 - ygao@suse.co +Mon Nov 20 16:20:53 UTC 2017 - ygao@suse.com - Update to version 1.1.18 - libpe_status: always use default key location with bundles diff --git a/pacemaker.spec b/pacemaker.spec index 8e3cb6d..919cf2f 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -30,6 +30,10 @@ ## Where to install Pacemaker documentation %global pcmk_docdir %{_docdir}/%{name} +## Path to Python interpreter (leave commented to auto-detect, +## or uncomment and edit to use a specific version) +%global python_path /usr/bin/python%{python3_version} + ## Corosync version %define cs_version 2 @@ -67,7 +71,7 @@ %endif Name: pacemaker -Version: 1.1.18+20180119.9146c3c20 +Version: 1.1.18+20180209.7acb22379 Release: 0 Summary: Scalable High-Availability cluster resource manager # AGPL-3.0 licensed extra/clustermon.sh is not present in the binary @@ -90,7 +94,6 @@ Patch8: bug-977201_pacemaker-controld-self-fencing.patch Patch9: bug-995365_pacemaker-cts-restart-systemd-journald.patch Patch10: fate-323526_pacemaker-tests-shebang-python3.patch Patch11: pacemaker-cts-StartCmd.patch -Patch12: fate-323526_pacemaker-pacemaker-configure-AM_PATH_PYTHON-python3.patch # Required for core functionality BuildRequires: autoconf BuildRequires: automake @@ -118,7 +121,7 @@ BuildRequires: pkgconfig(libexslt) BuildRequires: pkgconfig(libqb) > 0.13.0 BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libxslt) -# Pacemaker targets compatibility with python 2.7 and 3.2+ +# Pacemaker requires a minimum Python functionality BuildRequires: pkgconfig(python3) BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(uuid) @@ -264,7 +267,6 @@ manager. The libpacemaker-devel package contains headers and shared libraries for developing tools for Pacemaker. -# NOTE: can be noarch if lrmd_test is moved to another subpackage %package cts Summary: Test framework for cluster-related technologies Group: Productivity/Clustering/HA @@ -301,7 +303,6 @@ manager. %patch9 -p1 %patch10 -p1 %patch11 -p1 -%patch12 -p1 %build @@ -339,6 +340,7 @@ autoreconf -fvi %endif %{!?with_doc: --with-brand=} \ %{!?with_hardening: --disable-hardening} \ + %{?python_path: PYTHON=%{python_path}} \ --with-initdir=%{_initddir} \ --localstatedir=%{_var} \ --with-version=%{version}-%{release} @@ -352,9 +354,6 @@ install -d -m755 %{buildroot}%{_fillupdir} install -m 644 mcp/pacemaker.sysconfig %{buildroot}%{_fillupdir}/sysconfig.pacemaker install -m 644 tools/crm_mon.sysconfig %{buildroot}%{_fillupdir}/sysconfig.crm_mon -# Scripts that should be executable -chmod a+x %{buildroot}/%{_datadir}/pacemaker/tests/cts/CTSlab.py - # These are not actually scripts find %{buildroot} -name '*.xml' -type f -print0 | xargs -0 chmod a-x @@ -392,7 +391,7 @@ ln -s ../heartbeat/NodeUtilization %{buildroot}%{_libexecdir}/ocf/resource.d/pac %check # Prevent false positives in rpmlint -./BasicSanity.sh -V pengine cli 2>&1 +./cts/cts-regression -V pengine cli 2>&1 %pre %service_add_pre pacemaker.service @@ -540,6 +539,7 @@ fi %exclude %{_datadir}/pacemaker/tests %{_datadir}/pacemaker %{_datadir}/snmp/mibs/PCMK-MIB.txt +%{_libexecdir}/pacemaker/lrmd_test %exclude %{_libexecdir}/ocf/resource.d/pacemaker/controld %exclude %{_libexecdir}/ocf/resource.d/pacemaker/o2cb @@ -571,6 +571,8 @@ fi %dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker %dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/blackbox %dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/cores +%dir %attr (770, %{uname}, %{gname}) %{_var}/log/pacemaker +%dir %attr (770, %{uname}, %{gname}) %{_var}/log/pacemaker/bundles %files -n libpacemaker3 %defattr(-,root,root) @@ -587,8 +589,6 @@ fi #%license licenses/LGPLv2.1 %doc COPYING ChangeLog %{_libdir}/libcrmcluster.so.* -%dir %attr (770, %{uname}, %{gname}) %{_var}/log/pacemaker -%dir %attr (770, %{uname}, %{gname}) %{_var}/log/pacemaker/bundles %if %{enable_lib_cluster_pkg} %files -n libpacemaker3-cluster @@ -616,16 +616,13 @@ fi %files cts %defattr(-,root,root) -%{python3_sitearch}/cts -%{_datadir}/pacemaker/tests/cts -%{_libexecdir}/pacemaker/lrmd_test +%{python3_sitelib}/cts +%{_datadir}/pacemaker/tests #%license licenses/GPLv2 %doc COPYING ChangeLog %files -n libpacemaker-devel %defattr(-,root,root) -%exclude %{_datadir}/pacemaker/tests/cts -%{_datadir}/pacemaker/tests %{_includedir}/pacemaker %{_libdir}/*.so %if %{with coverage}