Skip to content

xrootd and pelican-server bundles #70

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

Draft
matyasselmeci wants to merge 3 commits into
base: master
Choose a base branch
from
+111 −9
Draft

xrootd and pelican-server bundles #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0370e6a
Add "xrootd-for-pelican" bundle using the OSG 25 packages (SOFTWARE-5…
matyasselmeci Oct 23, 2023
29a8854
Fix the version the xrootd tarball is getting
matyasselmeci Jan 9, 2026
4a39bd3
post-install script should only test for /usr/bin/perl if fetch-crl i…
matyasselmeci Jan 9, 2026
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
31 changes: 31 additions & 0 deletions bundles.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,3 +199,34 @@ repofile = repos/ligo-el6.repo.in
versionrpm = glue
stage1file = ligo-stage1.lst

[xrootd-for-pelican-el9]
paramsets = el9,x86_64
dirname = xrootd
tarballname = xrootd-for-pelican-%(version)s-%(relnum)s.tar.gz
;patchdirs = patches/xrootd-for-pelican
packages = xrdcl-pelican
xrootd-multiuser
xrootd-s3-http
xrootd-scitokens
xrootd-server
xrootd-tcp-stats
xrootd-voms
repofile = repos/osg-25-%(dver)s.repo.in
versionrpm = xrootd
stage1file = xrootd-for-pelican-stage1-%(dver)s.lst

[xrootd-for-pelican-el8]
# el8 does not have xrootd-s3-http
paramsets = el8,x86_64
dirname = xrootd
tarballname = xrootd-for-pelican-%(version)s-%(relnum)s.tar.gz
;patchdirs = patches/xrootd-for-pelican
packages = xrdcl-pelican
xrootd-multiuser
xrootd-scitokens
xrootd-server
xrootd-tcp-stats
xrootd-voms
repofile = repos/osg-25-%(dver)s.repo.in
versionrpm = xrootd
stage1file = xrootd-for-pelican-stage1-%(dver)s.lst
2 changes: 1 addition & 1 deletion make_client_tarball.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def make_tarball(bundlecfg, bundle, basearch, dver, packages, patch_dirs, prog_d
with yumconf.YumInstaller(repofile, dver, basearch, extra_repos) as yum:
if not version:
if bundlecfg.has_option(bundle, 'versionrpm'):
version = yum.repoquery(bundlecfg.get(bundle, 'versionrpm'), "--queryformat=%{VERSION}").rstrip()
version = yum.repoquery(bundlecfg.get(bundle, 'versionrpm'), "--latest-limit", "1", "--queryformat=%{VERSION}").rstrip()
else:
version = 'unknown'
tarball_path = bundlecfg.get(bundle, 'tarballname') % locals()
Expand Down
18 changes: 10 additions & 8 deletions post-install/osg_post_install.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,14 +182,16 @@ def fix_osg_location_in_sysconfig_bestman2(staging_dir, final_osg_location):
failure("Unable to fix BeSTMan2 sysconfig file for the following reason:\n%s" % err)


def check_required_binaries():
def check_required_binaries(staging_dir):
"""Make sure we have all the prerequisites for running the tarball install.

"""
print_nonl("Checking for required binaries...")
if not os.path.exists("/usr/bin/perl"):
failure("/usr/bin/perl not found (run \"yum install perl\" to install)")
return False
if os.path.exists(os.path.join(staging_dir, "usr/sbin/fetch-crl")):
# We need perl for fetch-crl
if not os.path.exists("/usr/bin/perl"):
failure("/usr/bin/perl not found (run \"yum install perl\" to install)")
return False
success()
return True

Expand Down Expand Up @@ -246,10 +248,6 @@ def get_staging_dir(arg_staging_dir=None):
def main(argv):
options, args = parse_cmdline_args(argv)

if not check_required_binaries():
print("Required binaries not installed. Please install them.")
return 1

if len(args) > 0:
staging_dir = get_staging_dir(args[0])
else:
Expand All @@ -259,6 +257,10 @@ def main(argv):
print("No valid staging directory found.")
return 2

if not check_required_binaries(staging_dir):
print("Required binaries not installed. Please install them.")
return 1

if options.final_osg_location:
print("Final OSG_LOCATION specified as %r" % (options.final_osg_location))
final_osg_location = options.final_osg_location
Expand Down
30 changes: 30 additions & 0 deletions xrootd-for-pelican-stage1-el8.lst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# Stage 1 packages
# These packages will be installed into the tarball staging directory but their
# files will be excluded from the tarball itself.
# Packages may be separated by newline or whitespace. Actual whitespace must
# be quoted.
@core
python36
setroubleshoot-server
setroubleshoot-plugins
sudo
# X libraries/GUI stuff
abattis-cantarell-fonts
cairo
fontconfig
gsettings-desktop-schemas
libX11
libXau
libXcursor
libXdmcp
libXext
libXfixes
libXft
libXi
libXinerama
libXrandr
libXrender
libXtst
# xrootd-specific dependencies that we want to exclude
expect
# vim:ft=conf
39 changes: 39 additions & 0 deletions xrootd-for-pelican-stage1-el9.lst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# Stage 1 packages
# These packages will be installed into the tarball staging directory but their
# files will be excluded from the tarball itself.
# Packages may be separated by newline or whitespace. Actual whitespace must
# be quoted.
@core
python3
setroubleshoot-server
setroubleshoot-plugins
sudo
# X libraries/GUI stuff
abattis-cantarell-fonts
cairo
fontconfig
gsettings-desktop-schemas
libX11
libXau
libXcursor
libXdmcp
libXext
libXfixes
libXft
libXi
libXinerama
libXrandr
libXrender
libXtst
# New in el9
annobin
gcc
gcc-c++
kernel-srpm-macros
libstdc++-devel
lua-srpm-macros
llvm-libs
pkgconf
# xrootd-specific dependencies that we want to exclude
expect