From bcad30bfe547f8f63bb1ac94315695b4c5bdb9d0 Mon Sep 17 00:00:00 2001 From: Martin Tzvetanov Grigorov Date: Fri, 4 Oct 2024 23:03:24 +0300 Subject: [PATCH 1/2] powerman: Remove the spec and the documentation for powerman It was not used since a long time. Signed-off-by: Martin Tzvetanov Grigorov --- components/admin/conman/SPECS/conman.spec | 1 - components/admin/powerman/LICENSE | 341 ------------------ components/admin/powerman/SOURCES/rpmlintrc | 3 - components/admin/powerman/SPECS/powerman.spec | 149 -------- .../install/almalinux9/input.local.template | 1 - .../install/centos8/input.local.template | 1 - docs/recipes/install/common/ohpc-doc.sty | 1 - docs/recipes/install/common/powerman.tex | 41 --- .../install/leap15/input.local.template | 1 - .../openeuler22.03/input.local.template | 1 - .../install/rocky9/input.local.template | 1 - tests/oob/warewulf-ipmi | 9 +- 12 files changed, 5 insertions(+), 545 deletions(-) delete mode 100644 components/admin/powerman/LICENSE delete mode 100644 components/admin/powerman/SOURCES/rpmlintrc delete mode 100644 components/admin/powerman/SPECS/powerman.spec delete mode 100644 docs/recipes/install/common/powerman.tex diff --git a/components/admin/conman/SPECS/conman.spec b/components/admin/conman/SPECS/conman.spec index 67922d6ab6..0951580c0d 100644 --- a/components/admin/conman/SPECS/conman.spec +++ b/components/admin/conman/SPECS/conman.spec @@ -81,7 +81,6 @@ SERVER logdir="/var/log/conman" SERVER logfile="/var/log/conman.log" SERVER loopback=ON SERVER pidfile="/var/run/conman.pid" -SERVER resetcmd="powerman -0 %N; sleep 3; powerman -1 %N" SERVER tcpwrappers=ON SERVER timestamp=1h GLOBAL seropts="115200,8n1" diff --git a/components/admin/powerman/LICENSE b/components/admin/powerman/LICENSE deleted file mode 100644 index 708c8cf6c0..0000000000 --- a/components/admin/powerman/LICENSE +++ /dev/null @@ -1,341 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. - diff --git a/components/admin/powerman/SOURCES/rpmlintrc b/components/admin/powerman/SOURCES/rpmlintrc deleted file mode 100644 index d4c1981907..0000000000 --- a/components/admin/powerman/SOURCES/rpmlintrc +++ /dev/null @@ -1,3 +0,0 @@ -addFilter("devel-file-in-non-devel-package") -addFilter("shlib-policy-name-error") -addFilter("library-without-ldconfig-postin") diff --git a/components/admin/powerman/SPECS/powerman.spec b/components/admin/powerman/SPECS/powerman.spec deleted file mode 100644 index 41142abf7b..0000000000 --- a/components/admin/powerman/SPECS/powerman.spec +++ /dev/null @@ -1,149 +0,0 @@ -#----------------------------------------------------------------------------bh- -# This RPM .spec file is part of the OpenHPC project. -# -# It may have been modified from the default version supplied by the underlying -# release package (if available) in order to apply patches, perform customized -# build/install configurations, and supply additional files to support -# desired integration conventions. -# -#----------------------------------------------------------------------------eh- - -%include %{_sourcedir}/OHPC_macros - -%define pname powerman - -Name: %{pname}%{PROJ_DELIM} -Version: 2.3.26 -Release: 1%{?dist} - -Summary: PowerMan - centralized power control for clusters -License: GPL -Group: %{PROJ_NAME}/admin -Url: http://code.google.com/p/powerman/ -Source0: https://github.com/chaos/%{pname}/releases/download/%{version}/%{pname}-%{version}.tar.gz - -%if 0%{?rhel} || 0%{?openEuler} -%define _with_httppower 1 -%define _with_snmppower 1 -%define _with_genders 1 -%endif - -%if 0%{?_with_genders} -BuildRequires: genders%{PROJ_DELIM} -%endif -%if 0%{?_with_httppower} -BuildRequires: curl-devel -%endif -%if 0%{?_with_snmppower} -BuildRequires: net-snmp-devel -%endif -BuildRequires: systemd -BuildRequires: make, gcc - -%package -n %{pname}-devel%{PROJ_DELIM} -Requires: %{name} = %{version}-%{release} -Summary: Headers and libraries for developing applications using PowerMan -Group: Development/Libraries - -%package -n %{pname}-libs%{PROJ_DELIM} -Requires: %{name} = %{version}-%{release} -Summary: Libraries for applications using PowerMan -Group: System Environment/Libraries - -%description -PowerMan is a tool for manipulating remote power control (RPC) devices from a -central location. Several RPC varieties are supported natively by PowerMan and -Expect-like configurability simplifies the addition of new devices. - -%description -n %{pname}-devel%{PROJ_DELIM} -A header file and static library for developing applications using PowerMan. - -%description -n %{pname}-libs%{PROJ_DELIM} -A shared library for applications using PowerMan. - -%prep -%setup -n %{pname}-%{version} - -%build -%configure --program-prefix=%{?_program_prefix:%{_program_prefix}} \ - %{?_with_genders: --with-genders} \ - %{?_with_httppower: --with-httppower} \ - %{?_with_snmppower: --with-snmppower} - -make - -%install -make install DESTDIR=$RPM_BUILD_ROOT - -# Put the systemd directory in the right location. -JCSIADAL 3/29/20 -%{__mv} $RPM_BUILD_ROOT/usr/usr/lib/systemd $RPM_BUILD_ROOT/usr/lib/ -%{__rm} -rd $RPM_BUILD_ROOT/usr/usr - -#drop local state dir to avoid making systemd angry when it creates the statedir on start -%{__rm} -rf $RPM_BUILD_ROOT/%{_localstatedir} - -%post -/bin/systemctl enable powerman > /dev/null 2>&1 || : - -%post -n %{pname}-libs%{PROJ_DELIM} -if [ -x /sbin/ldconfig ]; then /sbin/ldconfig %{_libdir}; fi - -%preun -if [ "$1" = 0 ]; then - systemctl stop powerman >/dev/null 2>&1 || : - systemctl disable powerman > /dev/null 2>&1 || : -fi - -%postun -if [ "$1" -ge 1 ]; then - systemctl try-restart powerman >/dev/null 2>&1 || : -fi - -%postun -n %{pname}-libs%{PROJ_DELIM} -if [ -x /sbin/ldconfig ]; then /sbin/ldconfig %{_libdir}; fi - -%files -%doc DISCLAIMER -%license COPYING -%doc NEWS -%doc TODO -%{_bindir}/powerman -%{_bindir}/pm -%{_sbindir}/powermand -%{_sbindir}/vpcd -%if 0%{?_with_httppower} -%{_sbindir}/httppower -%endif -%if 0%{?_with_snmppower} -%{_sbindir}/snmppower -%endif -%{_sbindir}/plmpower -%dir %config %{_sysconfdir}/powerman -%{_sysconfdir}/powerman/*.dev -%{_sysconfdir}/powerman/powerman.conf.example -%{_mandir}/*1/* -%{_mandir}/*5/* -%{_mandir}/*8/* -%{_libdir}/stonith/plugins/external/powerman -%dir %attr(0755,daemon,root) %{_libdir}/stonith -%dir %attr(0755,daemon,root) %{_libdir}/stonith/plugins -%dir %attr(0755,daemon,root) %{_libdir}/stonith/plugins/external -%attr(0644,root,root) %{_unitdir}/powerman.service -%config %attr(0644,root,root) %{_tmpfilesdir}/powerman.conf - -%files -n %{pname}-devel%{PROJ_DELIM} -%{_includedir}/* -%{_libdir}/*.la -%{_mandir}/*3/* -%ifnos aix5.3 aix5.2 aix5.1 aix5.0 aix4.3 -%{_libdir}/*.a -%{_libdir}/*.so -%{_libdir}/pkgconfig/* -%endif - -%files -n %{pname}-libs%{PROJ_DELIM} -%ifnos aix5.3 aix5.2 aix5.1 aix5.0 aix4.3 -%{_libdir}/*.so.* -%else -%{_libdir}/*.a -%endif diff --git a/docs/recipes/install/almalinux9/input.local.template b/docs/recipes/install/almalinux9/input.local.template index acb4bfffc6..c47e06ff96 100644 --- a/docs/recipes/install/almalinux9/input.local.template +++ b/docs/recipes/install/almalinux9/input.local.template @@ -61,7 +61,6 @@ enable_kargs="${enable_kargs:-0}" enable_beegfs_client="${enable_beegfs_client:-0}" enable_lustre_client="${enable_lustre_client:-0}" enable_mrsh="${enable_mrsh:-0}" -enable_powerman="${enable_powerman:-0}" enable_pmix="${enable_pmix:-0}" enable_geopm="${enable_geopm:-0}" diff --git a/docs/recipes/install/centos8/input.local.template b/docs/recipes/install/centos8/input.local.template index acb4bfffc6..c47e06ff96 100644 --- a/docs/recipes/install/centos8/input.local.template +++ b/docs/recipes/install/centos8/input.local.template @@ -61,7 +61,6 @@ enable_kargs="${enable_kargs:-0}" enable_beegfs_client="${enable_beegfs_client:-0}" enable_lustre_client="${enable_lustre_client:-0}" enable_mrsh="${enable_mrsh:-0}" -enable_powerman="${enable_powerman:-0}" enable_pmix="${enable_pmix:-0}" enable_geopm="${enable_geopm:-0}" diff --git a/docs/recipes/install/common/ohpc-doc.sty b/docs/recipes/install/common/ohpc-doc.sty index f75106caf7..956eda9488 100644 --- a/docs/recipes/install/common/ohpc-doc.sty +++ b/docs/recipes/install/common/ohpc-doc.sty @@ -140,7 +140,6 @@ \newcommand{\nhc}{NHC} \newcommand{\OHPC}{OpenHPC} \newcommand{\ORCM}{ORCM} -\newcommand{\powerman}{\emph{powerman}} \newcommand{\Sensys}{Sensys} \newcommand{\SLURM}{Slurm} \newcommand{\Warewulf}{Warewulf} diff --git a/docs/recipes/install/common/powerman.tex b/docs/recipes/install/common/powerman.tex deleted file mode 100644 index 74fb1c5dd8..0000000000 --- a/docs/recipes/install/common/powerman.tex +++ /dev/null @@ -1,41 +0,0 @@ -\powerman{} abstracts many different kinds of power control interfaces (IPMI, -smart PDU, etc) into a single clean interface. \powerman{} accepts node ranges -for controlling sets of nodes, and is the default {\em resetcmd} for \conman{} -as configured by this recipe. - -% begin_ohpc_run -% ohpc_validation_newline -% ohpc_command if [[ ${enable_powerman} -eq 1 ]];then -% ohpc_indent 5 -% ohpc_validation_comment Optionally, install powerman -\begin{lstlisting}[language=bash,keywords={},upquote=true] -# Install powerman -[sms](*\#*) (*\install*) powerman-ohpc - -# Create a basic powerman.conf -[sms](*\#*) cp /etc/powerman/powerman.conf{.example,} - -[sms](*\#*) perl -pi -e 's/^\#(tcpwrappers yes)/$1/' /etc/powerman/powerman.conf -[sms](*\#*) perl -pi -e 's/^\#(listen "0.0.0.0:10101")/$1/' /etc/powerman/powerman.conf -[sms](*\#*) perl -pi -e 's/^\#(include "\/etc\/powerman\/ipmipower\.dev")/$1/' \ - /etc/powerman/powerman.conf -[sms](*\#*) for ((i=0; i<$num_computes; i++)) ; do - perl -pi -e 'print "device \"ipmi'$i'\" \"ipmipower\" \"/usr/sbin/ipmipower -h ". - "'${c_bmc[$i]}' -u '$bmc_username' -p ". - "'${IPMI_PASSWORD:-undefined}'|&\"\n" if(/^\#device "ipmi1"/);' /etc/powerman/powerman.conf - done -[sms](*\#*) for ((i=0; i<$num_computes; i++)) ; do - perl -pi -e 'print "node \"'${c_name[$i]}'\" \"ipmi'$i'\" \"'${c_bmc[$i]}'\"\n" - if(/^\#node "t1"/);' /etc/powerman/powerman.conf - done - -# Start powerman -[sms](*\#*) systemctl start powerman - -# Check power status -[sms](*\#*) pm -q -\end{lstlisting} -% ohpc_indent 0 -% ohpc_command fi -% end_ohpc_run - diff --git a/docs/recipes/install/leap15/input.local.template b/docs/recipes/install/leap15/input.local.template index a1c1a70299..67bc72745b 100644 --- a/docs/recipes/install/leap15/input.local.template +++ b/docs/recipes/install/leap15/input.local.template @@ -51,7 +51,6 @@ enable_kargs="${enable_kargs:-0}" enable_beegfs_client="${enable_beegfs_client:-0}" enable_lustre_client="${enable_lustre_client:-0}" enable_mrsh="${enable_mrsh:-0}" -enable_powerman="${enable_powerman:-0}" enable_pmix="${enable_pmix:-0}" enable_geopm="${enable_geopm:-0}" diff --git a/docs/recipes/install/openeuler22.03/input.local.template b/docs/recipes/install/openeuler22.03/input.local.template index 968c289e53..cc16ebb246 100644 --- a/docs/recipes/install/openeuler22.03/input.local.template +++ b/docs/recipes/install/openeuler22.03/input.local.template @@ -61,7 +61,6 @@ enable_kargs="${enable_kargs:-0}" enable_beegfs_client="${enable_beegfs_client:-0}" enable_lustre_client="${enable_lustre_client:-0}" enable_mrsh="${enable_mrsh:-0}" -enable_powerman="${enable_powerman:-0}" enable_pmix="${enable_pmix:-0}" enable_geopm="${enable_geopm:-0}" enable_epol_updates="${enable_epol_updates:-1}" diff --git a/docs/recipes/install/rocky9/input.local.template b/docs/recipes/install/rocky9/input.local.template index acb4bfffc6..c47e06ff96 100644 --- a/docs/recipes/install/rocky9/input.local.template +++ b/docs/recipes/install/rocky9/input.local.template @@ -61,7 +61,6 @@ enable_kargs="${enable_kargs:-0}" enable_beegfs_client="${enable_beegfs_client:-0}" enable_lustre_client="${enable_lustre_client:-0}" enable_mrsh="${enable_mrsh:-0}" -enable_powerman="${enable_powerman:-0}" enable_pmix="${enable_pmix:-0}" enable_geopm="${enable_geopm:-0}" diff --git a/tests/oob/warewulf-ipmi b/tests/oob/warewulf-ipmi index c8d67adbbd..635c14162d 100755 --- a/tests/oob/warewulf-ipmi +++ b/tests/oob/warewulf-ipmi @@ -8,15 +8,16 @@ if [ -s ./common/TEST_ENV ];then source ./common/TEST_ENV fi -if [ ! -z "$SIMPLE_CI" ]; then - skip "Not supported in simple CI setup" -fi - if [ -n "$IPMI_PASSWORD" ];then export IPMI_PASSWORD fi @test "[warewulf-ipmi] ipmitool lanplus protocol" { + + if [ -n "$SIMPLE_CI" ]; then + skip "Not supported in simple CI setup" + fi + rpm -q --quiet warewulf-ipmi-ohpc || skip "Warewulf not installed, skipping warewulf-ipmitool check" run wwsh ipmi powerstatus c1 From 373d4626730b912f284e3c36954f05820e5b848e Mon Sep 17 00:00:00 2001 From: Martin Tzvetanov Grigorov Date: Fri, 4 Oct 2024 23:01:03 +0300 Subject: [PATCH 2/2] Move `skip` inside `@setup` functions Signed-off-by: Martin Tzvetanov Grigorov --- tests/oob/ipmitool | 10 ++++++---- tests/oob/warewulf-ipmi | 7 ++++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/tests/oob/ipmitool b/tests/oob/ipmitool index ba62f81926..5e897a7aaf 100755 --- a/tests/oob/ipmitool +++ b/tests/oob/ipmitool @@ -8,14 +8,16 @@ if [ -s ./common/TEST_ENV ];then source ./common/TEST_ENV fi -if [ ! -z "$SIMPLE_CI" ]; then - skip "Not supported in simple CI setup" -fi - if [ -n "$IPMI_PASSWORD" ];then export IPMI_PASSWORD fi +setup() { + if [ -n "$SIMPLE_CI" ]; then + skip "Not supported in simple CI setup" + fi +} + @test "[OOB] ipmitool exists" { run which ipmitool assert_success diff --git a/tests/oob/warewulf-ipmi b/tests/oob/warewulf-ipmi index 635c14162d..013c06dda5 100755 --- a/tests/oob/warewulf-ipmi +++ b/tests/oob/warewulf-ipmi @@ -12,12 +12,13 @@ if [ -n "$IPMI_PASSWORD" ];then export IPMI_PASSWORD fi -@test "[warewulf-ipmi] ipmitool lanplus protocol" { - +setup() { if [ -n "$SIMPLE_CI" ]; then skip "Not supported in simple CI setup" fi - +} + +@test "[warewulf-ipmi] ipmitool lanplus protocol" { rpm -q --quiet warewulf-ipmi-ohpc || skip "Warewulf not installed, skipping warewulf-ipmitool check" run wwsh ipmi powerstatus c1