Add support for enp1s0 style network interfaces, update arch parsing to split arch with '.'

Author: mwestphall

bin/analyze_job_output.py

@@ -46,10 +46,13 @@ def re_extract(regexp, data, flags=0, default=None, group=None):
 def extract_inet_address(run_job_log):
     eth0_block = re_extract(r'^\d:\s*eth0:(.*?)(?:^\d)', run_job_log, re.MULTILINE | re.DOTALL, group=1)
     ens3_block = re_extract(r'^\d:\s*ens3:(.*?)(?:^\d)', run_job_log, re.MULTILINE | re.DOTALL, group=1)
+    enp1s0_block = re_extract(r'^\d:\s*enp1s0:(.*?)(?:^\d)', run_job_log, re.MULTILINE | re.DOTALL, group=1)
     if eth0_block:
         return re_extract(r'^\s+inet\s+(.*?)\/', eth0_block, re.MULTILINE, group=1)
     elif ens3_block:
         return re_extract(r'^\s+inet\s+(.*?)\/', ens3_block, re.MULTILINE, group=1)
+    elif enp1s0_block:
+        return re_extract(r'^\s+inet\s+(.*?)\/', enp1s0_block, re.MULTILINE, group=1)
     else:
         return None
 

bin/run-job

@@ -88,6 +88,8 @@ if [[ -n `ip addr | grep eth0` ]]; then
     ip_address=`ip addr show eth0 | awk 'match($0, /inet ([0-9.]+)/, a) { print a[1] }'`
 elif [[ -n `ip addr | grep ens3` ]]; then
     ip_address=`ip addr show ens3 | awk 'match($0, /inet ([0-9.]+)/, a) { print a[1] }'`
+elif [[ -n `ip addr | grep enp1s0` ]]; then
+    ip_address=`ip addr show enp1s0 | awk 'match($0, /inet ([0-9.]+)/, a) { print a[1] }'`
 else
     echo 'Could not find IP address'
     exit 1

bin/vmu-reporter

@@ -221,11 +221,11 @@ def generate_cell(run):
 
 def sort_platforms_by_dver(platform_list):
     '''Sorts the OS's by dver so that we know which column to put each run
-     Assumes the OS's have the format: <flavor>_<dver>_<arch>'''
+     Assumes the OS's have the format: <flavor>_<dver>.<arch>'''
     dvers = {}
     for platform in platform_list:
         translated_platform = vmu.canonical_os_string(platform)
-        dver = translated_platform[-1]
+        dver = translated_platform.split(' ')[-2]
         try:
             dvers[dver].add(translated_platform)
         except KeyError:

bin/vmu.py

@@ -90,7 +90,7 @@ def canonical_os_string(os_release):
     result = result.replace('centos', 'CentOS')
     result = result.replace('rocky', 'Rocky')
     result = result.replace('alma', 'Alma')
-    result = re.sub(r'_(\d)_.*', r' \1', result)
+    result = re.sub(r'_(\d)\.(.*)', r' \1 (\2)', result)
     return result
 
 def canonical_src_string(sources):

jobs/single-test-run.sub

@@ -48,7 +48,8 @@ request_disk            = 16GB
  txie-dsigpu4000.chtc.wisc.edu,\
  voyles2000.chtc.wisc.edu,\
 "
-requirements            = (TARGET.HasVirshDefaultNetwork == True) && (TARGET.HasCHTCStaging == True) && !StringListMember(TARGET.Machine, MY.BadMachineList)
+requirements            = (TARGET.Arch == split("$(platform)",".")[1]) && (TARGET.HasVirshDefaultNetwork == True) && (TARGET.HasCHTCStaging == True) && !StringListMember(TARGET.Machine, MY.BadMachineList)
+
 
 log                     = osg-test.log
 

parameters.d/osg23-el8.yaml

@@ -5,8 +5,8 @@
 ###################
 
 platforms:
-  - rocky_8_x86_64
-  - alma_8_x86_64
+  - rocky_8.x86_64
+  - alma_8.x86_64
 
 sources:
   ###################

parameters.d/osg23-el9.yaml

@@ -5,9 +5,9 @@
 ###################
 
 platforms:
-  - centos_stream_9_x86_64
-  - rocky_9_x86_64
-  - alma_9_x86_64
+  - centos_stream_9.x86_64
+  - rocky_9.x86_64
+  - alma_9.x86_64
 
 sources:
   ###################

parameters.d/osg24-el8.yaml

@@ -5,8 +5,8 @@
 ###################
 
 platforms:
-  - rocky_8_x86_64
-  - alma_8_x86_64
+  - rocky_8.x86_64
+  - alma_8.x86_64
 
 sources:
   ###################

parameters.d/osg24-el9.yaml

@@ -5,9 +5,12 @@
 ###################
 
 platforms:
-  - centos_stream_9_x86_64
-  - rocky_9_x86_64
-  - alma_9_x86_64
+  - centos_stream_9.x86_64
+  - rocky_9.x86_64
+  - alma_9.x86_64
+  - centos_stream_9.aarch64
+  - rocky_9.aarch64
+  - alma_9.aarch64
 
 sources:
   ###################