Skip to content

Commit e710767

Browse files
matyasselmecimatyasselmeci
authored
Merge pull request #261 from mwestphall/SOFTWARE-6054-osg-25-and-el10
SOFTWARE-6054: OSG 25/el10
2 parents c61f3c2 + 3eda1c5 commit e710767

File tree

8 files changed

+439
-4
lines changed

8 files changed

+439
-4
lines changed

‎bin/extract-job-output‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@ for image_path in paths:
6161
# print " - creating directory"
6262
os.makedirs(local_dir)
6363
# print " - extracting"
64-
g.download(full_image_path, os.path.join(output_dir, image_path))
64+
try:
65+
g.download(full_image_path, os.path.join(output_dir, image_path))
66+
except Exception as e:
67+
print("Can't download path %s" % full_image_path, e)
6568

6669
print "ok"

‎bin/run-job‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ run_command_with_retries()
4444
osg_series=`grep series $INPUT_DIR/osg-test.conf | sed -e 's/series *= *//'`
4545

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

5050
# Starting with OSG 23, we dump release RPMs in the XX-main part of the tree
@@ -67,6 +67,11 @@ case $os_major_version in
6767
python_lib_dir='/usr/lib/python3.9'
6868
python='/usr/bin/python3'
6969
;;
70+
10 )
71+
priorities_rpm=
72+
python_lib_dir='/usr/lib/python3.12'
73+
python='/usr/bin/python3'
74+
;;
7075
* )
7176
echo "Could not determine OS major version from '$os_major_version'"
7277
exit 2

‎bin/vmu.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def canonical_os_string(os_release, param_name=False):
8383
result = result.replace('CentOS Stream', 'C. Stream')
8484
result = result.replace('Rocky Linux', 'Rocky')
8585
result = result.replace('AlmaLinux', 'Alma')
86-
result = re.sub(r'(\d)(\.\d+)?(.*)', r'\1 (\3)', result)
86+
result = re.sub(r'(\d{1,2})(\.\d+)?(.*)', r'\1 (\3)', result)
8787
else:
8888
# Handle OS string from 'platforms' test parameters
8989
result = os_release.replace('rhel', 'RHEL')
@@ -92,7 +92,7 @@ def canonical_os_string(os_release, param_name=False):
9292
result = result.replace('centos', 'CentOS')
9393
result = result.replace('rocky', 'Rocky')
9494
result = result.replace('alma', 'Alma')
95-
result = re.sub(r'_(\d)\.(.*)', r' \1 (\2)', result)
95+
result = re.sub(r'_(\d{1,2})\.(.*)', r' \1 (\2)', result)
9696
return result
9797

9898
def canonical_src_string(sources):

‎parameters.d/osg25-el10-aarch64.yaml‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
###################
2+
# OSG 24 tests for EL9
3+
# File format documention:
4+
# https://github.com/opensciencegrid/vm-test-runs#running-osg-test-in-vm-universe
5+
###################
6+
7+
platforms:
8+
- centos_stream_10.aarch64
9+
- rocky_10.aarch64
10+
- alma_10.aarch64
11+
12+
sources:
13+
###################
14+
# Format:
15+
# [<Github account>:<osg-test branch>;] <OSG ver>; <REPO 1, REPO 2...REPO N> [> <Update OSG ver>/<Update REPO 1, REPO 2...REPO N>]
16+
# Example:
17+
# Run osg-test (from 3.2-minefield) with packages from 3.2-release and 3.2-testing that are then upgraded to
18+
# 3.3-testing and 3-3-upcoming-testing:
19+
# 3.2; osg, osg-testing > 3.3/osg-testing, osg-upcoming-testing
20+
###################
21+
- opensciencegrid:master; 25; osg-minefield
22+
23+
package_sets:
24+
#### Required ####
25+
# label - used for reporting, should be consistent across param files
26+
# packages - list of packages to install in the test run
27+
#### Optional ####
28+
# selinux - enable SELinux for the package set, otherwise Permissive mode (default: True)
29+
# osg_java - Pre-install OSG java packages (default: False)
30+
# rng - Install entropy generation package (default: False)
31+
##################
32+
- label: Compute Entrypoint (Condor)
33+
packages:
34+
- osg-ce-condor
35+
- htcondor-ce-view
36+
- label: Compute Entrypoint (Slurm)
37+
packages:
38+
- osg-ce-slurm
39+
- htcondor-ce-view
40+
- slurm
41+
- slurm-slurmd
42+
- slurm-slurmctld
43+
- slurm-perlapi
44+
- slurm-slurmdbd
45+
- mariadb-server
46+
- label: Compute Entrypoint (Torque)
47+
packages:
48+
- osg-ce-pbs
49+
- htcondor-ce-view
50+
- torque
51+
- torque-server
52+
- torque-mom
53+
- torque-client
54+
- torque-scheduler
55+
- mariadb-server
56+
- label: Central Collector
57+
packages:
58+
- htcondor-ce-collector
59+
- htcondor-ce-view
60+
- fetch-crl
61+
- label: Worker Node (privileged)
62+
packages:
63+
- osg-wn-client
64+
- osg-oasis
65+
- apptainer-suid
66+
- label: Worker Node (privileged, tarball deps)
67+
packages:
68+
- osg-update-data
69+
- osg-wn-client
70+
- label: XRootD
71+
packages:
72+
- osg-xrootd-standalone
73+
- xrootd-multiuser
74+
- xrootd-client
75+
- voms-clients-cpp
76+
- label: GlideinwmsFrontend
77+
packages:
78+
- glideinwms-vofrontend
79+
- label: GlideinwmsFactory
80+
packages:
81+
- glideinwms-factory
82+
- label: HTVault-Config
83+
packages:
84+
- htvault-config
85+
- htgettoken
86+
87+

‎parameters.d/osg25-el10.yaml‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
###################
2+
# OSG 24 tests for EL9
3+
# File format documention:
4+
# https://github.com/opensciencegrid/vm-test-runs#running-osg-test-in-vm-universe
5+
###################
6+
7+
platforms:
8+
- centos_stream_10.x86_64
9+
- rocky_10.x86_64
10+
- alma_10.x86_64
11+
12+
sources:
13+
###################
14+
# Format:
15+
# [<Github account>:<osg-test branch>;] <OSG ver>; <REPO 1, REPO 2...REPO N> [> <Update OSG ver>/<Update REPO 1, REPO 2...REPO N>]
16+
# Example:
17+
# Run osg-test (from 3.2-minefield) with packages from 3.2-release and 3.2-testing that are then upgraded to
18+
# 3.3-testing and 3-3-upcoming-testing:
19+
# 3.2; osg, osg-testing > 3.3/osg-testing, osg-upcoming-testing
20+
###################
21+
- opensciencegrid:master; 25; osg-minefield
22+
23+
package_sets:
24+
#### Required ####
25+
# label - used for reporting, should be consistent across param files
26+
# packages - list of packages to install in the test run
27+
#### Optional ####
28+
# selinux - enable SELinux for the package set, otherwise Permissive mode (default: True)
29+
# osg_java - Pre-install OSG java packages (default: False)
30+
# rng - Install entropy generation package (default: False)
31+
##################
32+
- label: Compute Entrypoint (Condor)
33+
packages:
34+
- osg-ce-condor
35+
- htcondor-ce-view
36+
- label: Compute Entrypoint (Slurm)
37+
packages:
38+
- osg-ce-slurm
39+
- htcondor-ce-view
40+
- slurm
41+
- slurm-slurmd
42+
- slurm-slurmctld
43+
- slurm-perlapi
44+
- slurm-slurmdbd
45+
- mariadb-server
46+
- label: Compute Entrypoint (Torque)
47+
packages:
48+
- osg-ce-pbs
49+
- htcondor-ce-view
50+
- torque
51+
- torque-server
52+
- torque-mom
53+
- torque-client
54+
- torque-scheduler
55+
- mariadb-server
56+
- label: Central Collector
57+
packages:
58+
- htcondor-ce-collector
59+
- htcondor-ce-view
60+
- fetch-crl
61+
- label: Worker Node (privileged)
62+
packages:
63+
- osg-wn-client
64+
- osg-oasis
65+
- apptainer-suid
66+
- label: Worker Node (privileged, tarball deps)
67+
packages:
68+
- osg-update-data
69+
- osg-wn-client
70+
- label: XRootD
71+
packages:
72+
- osg-xrootd-standalone
73+
- xrootd-multiuser
74+
- xrootd-client
75+
- voms-clients-cpp
76+
- label: GlideinwmsFrontend
77+
packages:
78+
- glideinwms-vofrontend
79+
- label: GlideinwmsFactory
80+
packages:
81+
- glideinwms-factory
82+
- label: HTVault-Config
83+
packages:
84+
- htvault-config
85+
- htgettoken
86+
87+

‎parameters.d/osg25-el8.yaml‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
###################
2+
# OSG 24 tests for EL8
3+
# File format documention:
4+
# https://github.com/opensciencegrid/vm-test-runs#running-osg-test-in-vm-universe
5+
###################
6+
7+
platforms:
8+
- rocky_8.x86_64
9+
- alma_8.x86_64
10+
11+
sources:
12+
###################
13+
# Format:
14+
# [<Github account>:<osg-test branch>;] <OSG ver>; <REPO 1, REPO 2...REPO N> [> <Update OSG ver>/<Update REPO 1, REPO 2...REPO N>]
15+
# Example:
16+
# Run osg-test (from 3.2-minefield) with packages from 3.2-release and 3.2-testing that are then upgraded to
17+
# 3.3-testing and 3-3-upcoming-testing:
18+
# 3.2; osg, osg-testing > 3.3/osg-testing, osg-upcoming-testing
19+
###################
20+
- opensciencegrid:master; 24; osg, osg-upcoming > 25/osg-minefield
21+
- opensciencegrid:master; 25; osg-minefield
22+
23+
package_sets:
24+
#### Required ####
25+
# label - used for reporting, should be consistent across param files
26+
# packages - list of packages to install in the test run
27+
#### Optional ####
28+
# selinux - enable SELinux for the package set, otherwise Permissive mode (default: True)
29+
# osg_java - Pre-install OSG java packages (default: False)
30+
# rng - Install entropy generation package (default: False)
31+
##################
32+
- label: Compute Entrypoint (Condor)
33+
packages:
34+
- osg-ce-condor
35+
- htcondor-ce-view
36+
- label: Compute Entrypoint (Slurm)
37+
packages:
38+
- osg-ce-slurm
39+
- htcondor-ce-view
40+
- slurm
41+
- slurm-slurmd
42+
- slurm-slurmctld
43+
- slurm-perlapi
44+
- slurm-slurmdbd
45+
- mariadb-server
46+
- label: Central Collector
47+
packages:
48+
- htcondor-ce-collector
49+
- htcondor-ce-view
50+
- fetch-crl
51+
- label: Worker Node (privileged)
52+
packages:
53+
- osg-wn-client
54+
- osg-oasis
55+
- apptainer-suid
56+
- label: Worker Node (privileged, tarball deps)
57+
packages:
58+
- osg-update-data
59+
- osg-wn-client
60+
- label: XRootD
61+
packages:
62+
- osg-xrootd-standalone
63+
- xrootd-multiuser
64+
- xrootd-client
65+
- voms-clients-cpp
66+
- label: GlideinwmsFrontend
67+
packages:
68+
- glideinwms-vofrontend
69+
- label: GlideinwmsFactory
70+
packages:
71+
- glideinwms-factory
72+
- label: HTVault-Config
73+
packages:
74+
- htvault-config
75+
- htgettoken
76+
77+

‎parameters.d/osg25-el9-aarch64.yaml‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
###################
2+
# OSG 24 tests for EL9
3+
# File format documention:
4+
# https://github.com/opensciencegrid/vm-test-runs#running-osg-test-in-vm-universe
5+
###################
6+
7+
platforms:
8+
- centos_stream_9.aarch64
9+
- rocky_9.aarch64
10+
- alma_9.aarch64
11+
12+
sources:
13+
###################
14+
# Format:
15+
# [<Github account>:<osg-test branch>;] <OSG ver>; <REPO 1, REPO 2...REPO N> [> <Update OSG ver>/<Update REPO 1, REPO 2...REPO N>]
16+
# Example:
17+
# Run osg-test (from 3.2-minefield) with packages from 3.2-release and 3.2-testing that are then upgraded to
18+
# 3.3-testing and 3-3-upcoming-testing:
19+
# 3.2; osg, osg-testing > 3.3/osg-testing, osg-upcoming-testing
20+
###################
21+
- opensciencegrid:master; 24; osg, osg-upcoming > 25/osg-minefield
22+
- opensciencegrid:master; 25; osg-minefield
23+
24+
package_sets:
25+
#### Required ####
26+
# label - used for reporting, should be consistent across param files
27+
# packages - list of packages to install in the test run
28+
#### Optional ####
29+
# selinux - enable SELinux for the package set, otherwise Permissive mode (default: True)
30+
# osg_java - Pre-install OSG java packages (default: False)
31+
# rng - Install entropy generation package (default: False)
32+
##################
33+
- label: Compute Entrypoint (Condor)
34+
packages:
35+
- osg-ce-condor
36+
- htcondor-ce-view
37+
- label: Compute Entrypoint (Slurm)
38+
packages:
39+
- osg-ce-slurm
40+
- htcondor-ce-view
41+
- slurm
42+
- slurm-slurmd
43+
- slurm-slurmctld
44+
- slurm-perlapi
45+
- slurm-slurmdbd
46+
- mariadb-server
47+
- label: Compute Entrypoint (Torque)
48+
packages:
49+
- osg-ce-pbs
50+
- htcondor-ce-view
51+
- torque
52+
- torque-server
53+
- torque-mom
54+
- torque-client
55+
- torque-scheduler
56+
- mariadb-server
57+
- label: Central Collector
58+
packages:
59+
- htcondor-ce-collector
60+
- htcondor-ce-view
61+
- fetch-crl
62+
- label: Worker Node (privileged)
63+
packages:
64+
- osg-wn-client
65+
- osg-oasis
66+
- apptainer-suid
67+
- label: Worker Node (privileged, tarball deps)
68+
packages:
69+
- osg-update-data
70+
- osg-wn-client
71+
- label: XRootD
72+
packages:
73+
- osg-xrootd-standalone
74+
- xrootd-multiuser
75+
- xrootd-client
76+
- voms-clients-cpp
77+
- label: GlideinwmsFrontend
78+
packages:
79+
- glideinwms-vofrontend
80+
- label: GlideinwmsFactory
81+
packages:
82+
- glideinwms-factory
83+
- label: HTVault-Config
84+
packages:
85+
- htvault-config
86+
- htgettoken
87+
88+

0 commit comments

Comments
 (0)