Add baseline support for EL10, OSG 25

Author: westphall

bin/extract-job-output

@@ -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"

bin/run-job

@@ -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
@@ -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

bin/vmu.py

@@ -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')
@@ -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):