Skip to content

Add ofarm and lofarm to be recognized as FARM #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
C2Redhat wants to merge 1 commit into from
Closed

Add ofarm and lofarm to be recognized as FARM #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion packaging/perl-Permabit-checkServer/perl-Permabit-checkServer.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%define base_name Permabit-checkServer
Name: perl-%{base_name}
Version: 1.0
Release: 38%{?dist}
Release: 39%{?dist}
Summary: Permabit checkServer utility
License: GPL2+
URL: https://github.com/dm-vdo/common
Expand Down Expand Up @@ -98,6 +98,9 @@ find %{buildroot} -type f -name .packlist -delete
%{_fixperms} -c %{buildroot}

%changelog
* Thu Jul 16 2026 Chung Chung <[email protected]> - 1.0-39
- Add ofarm support

* Fri Oct 31 2025 Chung Chung <[email protected]> - 1.0-38
- Add Fedora 43 support

Expand Down
7 changes: 5 additions & 2 deletions perl/bin/checkServer.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1328,6 +1328,7 @@ sub _getOsClass {
fedora41 => \&isFortyOne,
fedora42 => \&isAdams,
fedora43 => \&isFortyThree,
fedora44 => \&isFortyFour,
rawhide => \&isRawhide,
);
# Fedora linux-next kernel can run on any Fedora OS. Check to see if
Expand Down Expand Up @@ -1685,6 +1686,8 @@ sub _isFarm {
return _hostInList(
'jfarm',
'pfarm',
'ofarm',
'lofarm',

@lorelei-sakai lorelei-sakai Jul 16, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should lofarm be in this list? pmifarm isn't.

@C2Redhat C2Redhat Jul 16, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK. I have removed it.

)
|| (getScamVar('FARM') eq 'yes');
}
Expand Down Expand Up @@ -1731,14 +1734,14 @@ sub _isJFarm {
# Check if this host is a pfarm class machine
##
sub _isPFarm {
return _hostInList('pfarm');
return _hostInList('pfarm', 'ofarm');
}

######################################################################
# Check if this host is a pfarm class machine
##
sub _isPMIFarm {
return _hostInList('pmifarm');
return _hostInList('pmifarm', 'lofarm');
}

######################################################################
Expand Down
2 changes: 1 addition & 1 deletion perl/checkServer/CheckServer/Host.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ sub isJFarm {
##
sub isPFarm {
my ($self) = assertNumArgs(1, @_);
return ($self->{_getCachedName()} //= $self->hostnameMatches(qr/^pfarm-/));
return ($self->{_getCachedName()} //= $self->hostnameMatches(qr/^[po]farm-/));
}

######################################################################
Expand Down
Loading