Merge branch 'main' into add_kgo_default_opts

Author: james-bruten-mo

suite_report.py

@@ -88,6 +88,7 @@
     "ncas": "fcm",
     "psc": "fcm",
     "uoleeds": "fcm",
+    "azngarch": "fcm",
     "Unknown": "true",
 }
 RESOURCE_MONITORING_JOBS = {
@@ -107,6 +108,7 @@
     "ncas": [],
     "psc": [],
     "uoleeds": [],
+    "azngarch": [],
     "Unknown": [],
 }
 CYLC_REVIEW_URL = {
@@ -124,6 +126,7 @@
     "ncas": "http://puma.nerc.ac.uk/cylc-review",
     "psc": "Unavailable",
     "uoleeds": "Unavailable",
+    "azngarch": "Unavailable",
     "Unknown": "Unavailable",
 }
 HIGHLIGHT_ROSE_ANA_FAILS = [
@@ -166,6 +169,7 @@
     "mss": [],
     "ncas": [],
     "psc": [],
+    "azngarch": [],
     "Unknown": [],
 }
 
@@ -754,13 +758,9 @@ def check_versions_files(self):
                 ending = ""
             project = vcs_data["url"]
 
-            prefix = "https://code.metoffice.gov.uk/svn/"
-            prefix_svn = "svn://fcm1/"
-            if project.startswith(prefix):
-                project = project[len(prefix) :]
-            if project.startswith(prefix_svn):
-                project = project[len(prefix_svn) :]
-            project = re.split("[/.]", project)[0].upper()
+            match = re.match(r"(?:https://.*?/svn/|svn://[^/]+/)([^/\./]+)", project)
+            if match:
+                project = match.group(1).upper()
             projects[project] = {}
 
             # Use the version control url as the project source