pool/fence-agents
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1197446 from network:ha-clustering:Factory

Browse Source 
- Remove 0001-Use-Python-3-for-all-scripts-bsc-1065966.patch use
  %python3_fix_shebang_path instead of it.
- Use the %python_module to be able to build for the system python
  version.
- Remove amt-ws support as openwsman is not available on SLES16

OBS-URL: https://build.opensuse.org/request/show/1197446
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fence-agents?expand=0&rev=77
This commit is contained in:
Dominique Leuenberger 2024-08-29 13:44:20 +00:00 committed by Git OBS Bridge
commit 5c8bff8083
4 changed files with 33 additions and 223 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

176
0001-Use-Python-3-for-all-scripts-bsc-1065966.patch
View File

@ -1,176 +0,0 @@
From cb2c637fa006c566af05ae84b5085c9a9b14541d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <krig@koru.se>
Date: Wed, 20 Jun 2018 11:12:56 +0200
Subject: [PATCH] Use Python 3 for all scripts (bsc#1065966)
---
agents/autodetect/autodetect.py | 2 +-
agents/autodetect/autodetect_test.py | 2 +-
agents/autodetect/fence_apc.py | 2 +-
agents/autodetect/fence_bladecenter.py | 2 +-
agents/autodetect/fence_brocade.py | 2 +-
agents/autodetect/fence_ilo_moonshot.py | 2 +-
agents/autodetect/fence_lpar.py | 2 +-
agents/autodetect/fencing.py | 2 +-
lib/tests/test_fencing.py | 2 +-
tests/fence_testing_test.py | 2 +-
tests/test-apc2.py | 2 +-
tests/test-apc5.py | 2 +-
tests/test-drac4.py | 2 +-
tests/test-multi-apc2.py | 2 +-
tests/test.py | 2 +-
15 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/agents/autodetect/autodetect.py b/agents/autodetect/autodetect.py
index 24d9a731..366e5212 100755
--- a/agents/autodetect/autodetect.py
+++ b/agents/autodetect/autodetect.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
import pexpect
import re
diff --git a/agents/autodetect/autodetect_test.py b/agents/autodetect/autodetect_test.py
index a18aaed0..462c469d 100755
--- a/agents/autodetect/autodetect_test.py
+++ b/agents/autodetect/autodetect_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
import unittest
import autodetect as detect
diff --git a/agents/autodetect/fence_apc.py b/agents/autodetect/fence_apc.py
index c6dd106e..935f18e8 100644
--- a/agents/autodetect/fence_apc.py
+++ b/agents/autodetect/fence_apc.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python -tt
+#!/usr/bin/python3 -tt
#####
##
diff --git a/agents/autodetect/fence_bladecenter.py b/agents/autodetect/fence_bladecenter.py
index d72c07f1..dbcdb0d8 100644
--- a/agents/autodetect/fence_bladecenter.py
+++ b/agents/autodetect/fence_bladecenter.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python -tt
+#!/usr/bin/python3 -tt
#####
##
diff --git a/agents/autodetect/fence_brocade.py b/agents/autodetect/fence_brocade.py
index 5257bccb..f1df7a23 100644
--- a/agents/autodetect/fence_brocade.py
+++ b/agents/autodetect/fence_brocade.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python -tt
+#!/usr/bin/python3 -tt
import sys, re
import atexit
diff --git a/agents/autodetect/fence_ilo_moonshot.py b/agents/autodetect/fence_ilo_moonshot.py
index e161ac65..a7e827bb 100644
--- a/agents/autodetect/fence_ilo_moonshot.py
+++ b/agents/autodetect/fence_ilo_moonshot.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python -tt
+#!/usr/bin/python3 -tt
import sys
import atexit
diff --git a/agents/autodetect/fence_lpar.py b/agents/autodetect/fence_lpar.py
index 6676e1c6..59cc2213 100644
--- a/agents/autodetect/fence_lpar.py
+++ b/agents/autodetect/fence_lpar.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python -tt
+#!/usr/bin/python3 -tt
#####
##
diff --git a/agents/autodetect/fencing.py b/agents/autodetect/fencing.py
index ea21ace1..5d891eee 100644
--- a/agents/autodetect/fencing.py
+++ b/agents/autodetect/fencing.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python -tt
+#!/usr/bin/python3 -tt
import sys, getopt, time, os, uuid, pycurl, stat
import pexpect, re, syslog
diff --git a/lib/tests/test_fencing.py b/lib/tests/test_fencing.py
index 6ee93858..389e9746 100644
--- a/lib/tests/test_fencing.py
+++ b/lib/tests/test_fencing.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
import unittest
import sys
diff --git a/tests/fence_testing_test.py b/tests/fence_testing_test.py
index 36b2a5e0..9da9d0cf 100755
--- a/tests/fence_testing_test.py
+++ b/tests/fence_testing_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
import unittest
import fence_testing
diff --git a/tests/test-apc2.py b/tests/test-apc2.py
index bb5aefd8..d4325b9d 100755
--- a/tests/test-apc2.py
+++ b/tests/test-apc2.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
from fence_testing import test_action
diff --git a/tests/test-apc5.py b/tests/test-apc5.py
index 6cea3b1c..2679b15b 100755
--- a/tests/test-apc5.py
+++ b/tests/test-apc5.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
from fence_testing import test_action
diff --git a/tests/test-drac4.py b/tests/test-drac4.py
index 75c24c51..b750f0f3 100755
--- a/tests/test-drac4.py
+++ b/tests/test-drac4.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
from fence_testing import test_action
diff --git a/tests/test-multi-apc2.py b/tests/test-multi-apc2.py
index 7ab9754d..e06e3d97 100755
--- a/tests/test-multi-apc2.py
+++ b/tests/test-multi-apc2.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
from fence_testing import test_action
diff --git a/tests/test.py b/tests/test.py
index 8e82ed98..a39822ec 100755
--- a/tests/test.py
+++ b/tests/test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
from fence_testing import test_action
--
2.17.1

4
fence-agents-4.15.0+git.1719822011.7a2c0a7f.tar.xz
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7f2799b742c055e0160aebe979107953256e01fd5c88dd60951fc140e818043e
size 619264
oid sha256:06645c6830fce2e4c561a748dfb15afb9788bde30eb3d6fa973766b684a079db
size 339460

9
fence-agents.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu Aug 29 07:48:56 UTC 2024 - Peter Varkoly <varkoly@suse.com>
- Remove 0001-Use-Python-3-for-all-scripts-bsc-1065966.patch use
%python3_fix_shebang_path instead of it.
- Use the %python_module to be able to build for the system python
version.
- Remove amt-ws support as openwsman is not available on SLES16
-------------------------------------------------------------------
Mon Aug 5 09:19:27 UTC 2024 - Peter Varkoly <varkoly@suse.com>

67
fence-agents.spec
View File

@ -16,8 +16,7 @@
#
%define agent_list aliyun alom amt amt_ws apc apc_snmp aws azure_arm bladecenter brocade cisco_mds cisco_ucs compute docker drac5 dummy eaton_snmp eaton_ssh emerson eps evacuate gce hds_cb hpblade ibmblade ibmz ibm_powervs ibm_vpc ifmib ilo ilo_moonshot ilo_mp ilo_ssh intelmodular ipdu ipmilan ironic kdump ldom lpar mpath netio openstack powerman pve raritan rcd_serial redfish rhevm rsa rsb sanbox2 sbd scsi vbox virsh vmware vmware_rest wti xenapi zvm
%define agent_list aliyun alom amt apc apc_snmp aws azure_arm bladecenter brocade cisco_mds cisco_ucs compute docker drac5 dummy eaton_snmp eaton_ssh emerson eps evacuate gce hds_cb hpblade ibmblade ibmz ibm_powervs ibm_vpc ifmib ilo ilo_moonshot ilo_mp ilo_ssh intelmodular ipdu ipmilan ironic kdump ldom lpar mpath netio openstack powerman pve raritan rcd_serial redfish rhevm rsa rsb sanbox2 sbd scsi vbox virsh vmware vmware_rest wti xenapi zvm
Name: fence-agents
Summary: Set of unified programs capable of host isolation ("fencing")
Version: 4.15.0+git.1719822011.7a2c0a7f
@ -26,7 +25,6 @@ License: GPL-2.0-or-later AND LGPL-2.0-or-later
Group: Productivity/Clustering/HA
URL: https://github.com/ClusterLabs/fence-agents
Source0: %{name}-%{version}.tar.xz
Patch1: 0001-Use-Python-3-for-all-scripts-bsc-1065966.patch
%define boto3_br 1
@ -36,7 +34,6 @@ Patch1: 0001-Use-Python-3-for-all-scripts-bsc-1065966.patch
%global allfenceagents %(cat <<EOF
fence-agents-alom \\
fence-agents-amt \\
fence-agents-amt-ws \\
fence-agents-apc \\
fence-agents-apc-snmp \\
fence-agents-aws \\
@ -87,6 +84,7 @@ fence-agents-zvm \\
EOF)
#Agents not in sles
#fence-agents-amt-ws \\
#fence-agents-cdu \\
#fence-agents-cyberpower-ssh \\
#fence-agents-ecloud \\
@ -118,25 +116,21 @@ BuildRequires: gcc
## man pages generating
BuildRequires: libxslt
## Python dependencies
BuildRequires: python3-devel
BuildRequires: python3-httplib2
BuildRequires: python3-pexpect
BuildRequires: python3-pycurl
BuildRequires: python3-requests
%if 0%{?suse_version} > 1500
BuildRequires: python3-suds-community
%else
BuildRequires: python3-suds
%endif
BuildRequires: python-rpm-macros
BuildRequires: %{python_module devel}
BuildRequires: %{python_module httplib2}
BuildRequires: %{python_module pexpect}
BuildRequires: %{python_module pycurl}
BuildRequires: %{python_module requests}
BuildRequires: %{python_module suds}
%if 0%{?fedora} || 0%{?centos} || 0%{?rhel}
BuildRequires: openwsman-python3
%if %{boto3_br}
BuildRequires: python3-boto3
%endif
%else
BuildRequires: python3-openwsman
%if %{boto3_br}
BuildRequires: python3-boto3
BuildRequires: %{python_module boto3}
%endif
%endif
@ -208,6 +202,9 @@ rm -f %{buildroot}/%{_libdir}/%{name}/*.*a
rm -f %{buildroot}/%{_libdir}/fence-virt/*.*a
#%fdupes %buildroot%{_sbindir}
#%fdupes %buildroot%{_datadir}/cluster
%if %{defined python3_fix_shebang_path}
%python3_fix_shebang_path %{buildroot}/%{_sbindir}/*
%endif
%check
make check
@ -283,15 +280,6 @@ This package serves as a catch-all for all supported fence agents.
%files all
%ifarch x86_64
%package aliyun
License: Apache-2.0 AND GPL-2.0-or-later AND LGPL-2.0-or-later AND BSD-3-Clause AND MIT
Group: System Environment/Base
Summary: Fence agent for Alibaba Cloud (Aliyun)
Requires: fence-agents-common >= %{version}-%{release}
Requires: python3-jmespath >= 0.9.0
Conflicts: %{name} < %{version}-%{release}
%package devel
Summary: Fence Agents for High Availability
License: GPL-2.0-only AND LGPL-2.1-only
@ -310,6 +298,15 @@ development.
%{_sbindir}/fence_dummy
%{_mandir}/man8/fence_dummy*
%ifarch x86_64
%package aliyun
License: Apache-2.0 AND GPL-2.0-or-later AND LGPL-2.0-or-later AND BSD-3-Clause AND MIT
Group: System Environment/Base
Summary: Fence agent for Alibaba Cloud (Aliyun)
Requires: fence-agents-common >= %{version}-%{release}
Requires: python3-jmespath >= 0.9.0
Conflicts: %{name} < %{version}-%{release}
%description aliyun
The fence-agents-aliyun package contains a fence agent for Alibaba Cloud (Aliyun) instances.
@ -353,26 +350,6 @@ Fence agent for AMT compatibile devices that are accessed via
%{_sbindir}/fence_amt
%{_mandir}/man8/fence_amt.8*
%package amt-ws
License: Apache-2.0
Summary: Fence agent for Intel AMT (WS-Man) devices
Requires: fence-agents-common = %{version}-%{release}
%if 0%{?fedora} || 0%{?centos} || 0%{?rhel}
Requires: openwsman-python3
%else
Requires: python3-openwsman
%endif
Provides: %{name}-amt_ws = %{version}-%{release}
Obsoletes: %{name}-amt_ws < %{version}-%{release}
BuildArch: noarch
%description amt-ws
Fence agent for AMT (WS-Man) devices.
%files amt-ws
%{_sbindir}/fence_amt_ws
%{_mandir}/man8/fence_amt_ws.8*
%package apc
License: GPL-2.0-or-later AND LGPL-2.0-or-later
Summary: Fence agent for APC devices