Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 bin/extract-job-output
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ for image_path in paths:
# print " - creating directory"
os.makedirs(local_dir)
# print " - extracting"
g.download(full_image_path, os.path.join(output_dir, image_path))
try:
g.download(full_image_path, os.path.join(output_dir, image_path))
except Exception as e:
print("Can't download path %s" % full_image_path, e)

print "ok"
7 changes: 6 additions & 1 deletion bin/run-job
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ run_command_with_retries()
osg_series=`grep series $INPUT_DIR/osg-test.conf | sed -e 's/series *= *//'`

# Set variables based on OS major version
os_major_version=`sed -e 's/^[^0-9]*//' -e 's/\..*$//' /etc/redhat-release`
os_major_version=`sed -e 's/^[^0-9]*//' -e 's/[^0-9].*$//' /etc/redhat-release`
epel_url="https://dl.fedoraproject.org/pub/epel/epel-release-latest-$os_major_version.noarch.rpm"

# Starting with OSG 23, we dump release RPMs in the XX-main part of the tree
Expand All @@ -67,6 +67,11 @@ case $os_major_version in
python_lib_dir='/usr/lib/python3.9'
python='/usr/bin/python3'
;;
10 )
priorities_rpm=
python_lib_dir='/usr/lib/python3.12'
python='/usr/bin/python3'
;;
* )
echo "Could not determine OS major version from '$os_major_version'"
exit 2
Expand Down
4 changes: 2 additions & 2 deletions bin/vmu.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def canonical_os_string(os_release, param_name=False):
result = result.replace('CentOS Stream', 'C. Stream')
result = result.replace('Rocky Linux', 'Rocky')
result = result.replace('AlmaLinux', 'Alma')
result = re.sub(r'(\d)(\.\d+)?(.*)', r'\1 (\3)', result)
result = re.sub(r'(\d{1,2})(\.\d+)?(.*)', r'\1 (\3)', result)
else:
# Handle OS string from 'platforms' test parameters
result = os_release.replace('rhel', 'RHEL')
Expand All @@ -92,7 +92,7 @@ def canonical_os_string(os_release, param_name=False):
result = result.replace('centos', 'CentOS')
result = result.replace('rocky', 'Rocky')
result = result.replace('alma', 'Alma')
result = re.sub(r'_(\d)\.(.*)', r' \1 (\2)', result)
result = re.sub(r'_(\d{1,2})\.(.*)', r' \1 (\2)', result)
return result

def canonical_src_string(sources):
Expand Down
87 changes: 87 additions & 0 deletions parameters.d/osg25-el10-aarch64.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
###################
# OSG 24 tests for EL9
# File format documention:
# https://github.com/opensciencegrid/vm-test-runs#running-osg-test-in-vm-universe
###################

platforms:
- centos_stream_10.aarch64
- rocky_10.aarch64
- alma_10.aarch64

sources:
###################
# Format:
# [<Github account>:<osg-test branch>;] <OSG ver>; <REPO 1, REPO 2...REPO N> [> <Update OSG ver>/<Update REPO 1, REPO 2...REPO N>]
# Example:
# Run osg-test (from 3.2-minefield) with packages from 3.2-release and 3.2-testing that are then upgraded to
# 3.3-testing and 3-3-upcoming-testing:
# 3.2; osg, osg-testing > 3.3/osg-testing, osg-upcoming-testing
###################
- opensciencegrid:master; 25; osg-minefield

package_sets:
#### Required ####
# label - used for reporting, should be consistent across param files
# packages - list of packages to install in the test run
#### Optional ####
# selinux - enable SELinux for the package set, otherwise Permissive mode (default: True)
# osg_java - Pre-install OSG java packages (default: False)
# rng - Install entropy generation package (default: False)
##################
- label: Compute Entrypoint (Condor)
packages:
- osg-ce-condor
- htcondor-ce-view
- label: Compute Entrypoint (Slurm)
packages:
- osg-ce-slurm
- htcondor-ce-view
- slurm
- slurm-slurmd
- slurm-slurmctld
- slurm-perlapi
- slurm-slurmdbd
- mariadb-server
- label: Compute Entrypoint (Torque)
packages:
- osg-ce-pbs
- htcondor-ce-view
- torque
- torque-server
- torque-mom
- torque-client
- torque-scheduler
- mariadb-server
- label: Central Collector
packages:
- htcondor-ce-collector
- htcondor-ce-view
- fetch-crl
- label: Worker Node (privileged)
packages:
- osg-wn-client
- osg-oasis
- apptainer-suid
- label: Worker Node (privileged, tarball deps)
packages:
- osg-update-data
- osg-wn-client
- label: XRootD
packages:
- osg-xrootd-standalone
- xrootd-multiuser
- xrootd-client
- voms-clients-cpp
- label: GlideinwmsFrontend
packages:
- glideinwms-vofrontend
- label: GlideinwmsFactory
packages:
- glideinwms-factory
- label: HTVault-Config
packages:
- htvault-config
- htgettoken


87 changes: 87 additions & 0 deletions parameters.d/osg25-el10.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
###################
# OSG 24 tests for EL9
# File format documention:
# https://github.com/opensciencegrid/vm-test-runs#running-osg-test-in-vm-universe
###################

platforms:
- centos_stream_10.x86_64
- rocky_10.x86_64
- alma_10.x86_64

sources:
###################
# Format:
# [<Github account>:<osg-test branch>;] <OSG ver>; <REPO 1, REPO 2...REPO N> [> <Update OSG ver>/<Update REPO 1, REPO 2...REPO N>]
# Example:
# Run osg-test (from 3.2-minefield) with packages from 3.2-release and 3.2-testing that are then upgraded to
# 3.3-testing and 3-3-upcoming-testing:
# 3.2; osg, osg-testing > 3.3/osg-testing, osg-upcoming-testing
###################
- opensciencegrid:master; 25; osg-minefield

package_sets:
#### Required ####
# label - used for reporting, should be consistent across param files
# packages - list of packages to install in the test run
#### Optional ####
# selinux - enable SELinux for the package set, otherwise Permissive mode (default: True)
# osg_java - Pre-install OSG java packages (default: False)
# rng - Install entropy generation package (default: False)
##################
- label: Compute Entrypoint (Condor)
packages:
- osg-ce-condor
- htcondor-ce-view
- label: Compute Entrypoint (Slurm)
packages:
- osg-ce-slurm
- htcondor-ce-view
- slurm
- slurm-slurmd
- slurm-slurmctld
- slurm-perlapi
- slurm-slurmdbd
- mariadb-server
- label: Compute Entrypoint (Torque)
packages:
- osg-ce-pbs
- htcondor-ce-view
- torque
- torque-server
- torque-mom
- torque-client
- torque-scheduler
- mariadb-server
- label: Central Collector
packages:
- htcondor-ce-collector
- htcondor-ce-view
- fetch-crl
- label: Worker Node (privileged)
packages:
- osg-wn-client
- osg-oasis
- apptainer-suid
- label: Worker Node (privileged, tarball deps)
packages:
- osg-update-data
- osg-wn-client
- label: XRootD
packages:
- osg-xrootd-standalone
- xrootd-multiuser
- xrootd-client
- voms-clients-cpp
- label: GlideinwmsFrontend
packages:
- glideinwms-vofrontend
- label: GlideinwmsFactory
packages:
- glideinwms-factory
- label: HTVault-Config
packages:
- htvault-config
- htgettoken


77 changes: 77 additions & 0 deletions parameters.d/osg25-el8.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
###################
# OSG 24 tests for EL8
# File format documention:
# https://github.com/opensciencegrid/vm-test-runs#running-osg-test-in-vm-universe
###################

platforms:
- rocky_8.x86_64
- alma_8.x86_64

sources:
###################
# Format:
# [<Github account>:<osg-test branch>;] <OSG ver>; <REPO 1, REPO 2...REPO N> [> <Update OSG ver>/<Update REPO 1, REPO 2...REPO N>]
# Example:
# Run osg-test (from 3.2-minefield) with packages from 3.2-release and 3.2-testing that are then upgraded to
# 3.3-testing and 3-3-upcoming-testing:
# 3.2; osg, osg-testing > 3.3/osg-testing, osg-upcoming-testing
###################
- opensciencegrid:master; 24; osg, osg-upcoming > 25/osg-minefield
- opensciencegrid:master; 25; osg-minefield

package_sets:
#### Required ####
# label - used for reporting, should be consistent across param files
# packages - list of packages to install in the test run
#### Optional ####
# selinux - enable SELinux for the package set, otherwise Permissive mode (default: True)
# osg_java - Pre-install OSG java packages (default: False)
# rng - Install entropy generation package (default: False)
##################
- label: Compute Entrypoint (Condor)
packages:
- osg-ce-condor
- htcondor-ce-view
- label: Compute Entrypoint (Slurm)
packages:
- osg-ce-slurm
- htcondor-ce-view
- slurm
- slurm-slurmd
- slurm-slurmctld
- slurm-perlapi
- slurm-slurmdbd
- mariadb-server
- label: Central Collector
packages:
- htcondor-ce-collector
- htcondor-ce-view
- fetch-crl
- label: Worker Node (privileged)
packages:
- osg-wn-client
- osg-oasis
- apptainer-suid
- label: Worker Node (privileged, tarball deps)
packages:
- osg-update-data
- osg-wn-client
- label: XRootD
packages:
- osg-xrootd-standalone
- xrootd-multiuser
- xrootd-client
- voms-clients-cpp
- label: GlideinwmsFrontend
packages:
- glideinwms-vofrontend
- label: GlideinwmsFactory
packages:
- glideinwms-factory
- label: HTVault-Config
packages:
- htvault-config
- htgettoken


88 changes: 88 additions & 0 deletions parameters.d/osg25-el9-aarch64.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
###################
# OSG 24 tests for EL9
# File format documention:
# https://github.com/opensciencegrid/vm-test-runs#running-osg-test-in-vm-universe
###################

platforms:
- centos_stream_9.aarch64
- rocky_9.aarch64
- alma_9.aarch64

sources:
###################
# Format:
# [<Github account>:<osg-test branch>;] <OSG ver>; <REPO 1, REPO 2...REPO N> [> <Update OSG ver>/<Update REPO 1, REPO 2...REPO N>]
# Example:
# Run osg-test (from 3.2-minefield) with packages from 3.2-release and 3.2-testing that are then upgraded to
# 3.3-testing and 3-3-upcoming-testing:
# 3.2; osg, osg-testing > 3.3/osg-testing, osg-upcoming-testing
###################
- opensciencegrid:master; 24; osg, osg-upcoming > 25/osg-minefield
- opensciencegrid:master; 25; osg-minefield

package_sets:
#### Required ####
# label - used for reporting, should be consistent across param files
# packages - list of packages to install in the test run
#### Optional ####
# selinux - enable SELinux for the package set, otherwise Permissive mode (default: True)
# osg_java - Pre-install OSG java packages (default: False)
# rng - Install entropy generation package (default: False)
##################
- label: Compute Entrypoint (Condor)
packages:
- osg-ce-condor
- htcondor-ce-view
- label: Compute Entrypoint (Slurm)
packages:
- osg-ce-slurm
- htcondor-ce-view
- slurm
- slurm-slurmd
- slurm-slurmctld
- slurm-perlapi
- slurm-slurmdbd
- mariadb-server
- label: Compute Entrypoint (Torque)
packages:
- osg-ce-pbs
- htcondor-ce-view
- torque
- torque-server
- torque-mom
- torque-client
- torque-scheduler
- mariadb-server
- label: Central Collector
packages:
- htcondor-ce-collector
- htcondor-ce-view
- fetch-crl
- label: Worker Node (privileged)
packages:
- osg-wn-client
- osg-oasis
- apptainer-suid
- label: Worker Node (privileged, tarball deps)
packages:
- osg-update-data
- osg-wn-client
- label: XRootD
packages:
- osg-xrootd-standalone
- xrootd-multiuser
- xrootd-client
- voms-clients-cpp
- label: GlideinwmsFrontend
packages:
- glideinwms-vofrontend
- label: GlideinwmsFactory
packages:
- glideinwms-factory
- label: HTVault-Config
packages:
- htvault-config
- htgettoken


Loading