Merge remote-tracking branch 'upstream/main' into git_migration_pkg_branch

Author: james-bruten-mo

git-migration/config.json

@@ -223,7 +223,8 @@
         { "um13.6": 1642 },
         { "um13.7": 1673 },
         { "um13.8": 1741 },
-        { "um13.9": 1831 }
+        { "um13.9": 1831 },
+        { "git_migration": 1951 }
       ]
     },
     {
@@ -559,7 +560,8 @@
         { "um13.6": 1613 },
         { "um13.7": 1613 },
         { "um13.8": 1736 },
-        { "um13.9": 1829 }
+        { "um13.9": 1829 },
+        { "git_migration": 1829 }
       ]
     }
   ]

github_scripts/suite_data.py

@@ -176,10 +176,7 @@ def populate_gitbdiff(self) -> None:
 
         for dependency, data in self.dependencies.items():
             if not data["gitinfo"].is_main():
-                if dependency.lower() == "simsys_scripts":
-                    parent = "main"
-                else:
-                    parent = "trunk"
+                parent = "main"
                 self.dependencies[dependency]["gitbdiff"] = GitBDiff(
                     repo=self.temp_directory / dependency, parent=parent
                 ).files()
@@ -309,7 +306,7 @@ def get_workflow_id(self) -> str:
 
         with open(self.suite_path / "log" / "scheduler" / "log", "r") as f:
             for line in f:
-                match = re.search(r"INFO - Workflow: (\w+\/\w+)", line)
+                match = re.search(r"INFO - Workflow: (\S+\/\w+)", line)
                 try:
                     workflow_id = match.group(1)
                     return workflow_id
@@ -339,7 +336,7 @@ def read_groups_run(self) -> str:
         for row in self.query_suite_database(
             self.suite_path / "log" / "db", ["key", "value"], "workflow_template_vars"
         ):
-            if row[0] in ("g", "groups"):
+            if row[0] in ("g", "group"):
                 groups = row[1].strip("[]'\"").split(",")
                 break
         return groups

github_scripts/suite_report_git.py

@@ -123,7 +123,6 @@ def create_suite_info_table(self) -> None:
             ("Suite User", self.suite_user),
             ("Workflow Start", self.suite_starttime),
             ("Groups Run", ",".join(g for g in self.groups)),
-            ("ROSE_ORIG_HOST", self.rose_data["ROSE_ORIG_HOST"]),
         )
 
         for row in rows:

nightly_testing/generate_test_suite_cron.py

@@ -176,7 +176,7 @@ def generate_clean_commands(cylc_version, name, log_file):
     return (
         f"{PROFILE} ; "
         f"export CYLC_VERSION={cylc_version} ; "
-        f"cylc stop '{name}' >/dev/null 2>&1 ; sleep 10 ; "
+        f"cylc stop --kill '{name}' >/dev/null 2>&1 ; sleep 10 ; "
         f"cylc clean --timeout=7200 -y -q {name} "
         f">> {log_file} 2>&1\n"
     )
@@ -214,7 +214,7 @@ def generate_cylc_command(suite, wc_path, cylc_version, name):
     )
     if "revisions" in suite and suite["revisions"] == "heads":
         command += "-S USE_HEADS=true "
-    command += f"{os.path.join(wc_path, "rose-stem")} "
+    command += f"{os.path.join(wc_path, 'rose-stem')} "
     return command
 
 
@@ -244,10 +244,6 @@ def generate_main_job(name, suite, log_file, wc_path, cylc_version):
 
     job_command = f"{PROFILE} ; "
 
-    # LFRic Apps heads uses a different working copy
-    if suite["repo"] == "lfric_apps" and suite["revisions"] == "heads":
-        wc_path = wc_path + "_heads"
-
     # Begin rose-stem command
     job_command += generate_cylc_command(suite, wc_path, cylc_version, name)
 
@@ -282,7 +278,7 @@ def generate_cron_job(suite_name, suite, log_file):
 
     date_str = f"_$({DATE_BASE})"
     name = suite_name + date_str
-    wc_path = os.path.join(CLONE_DIR, "wc_" + suite["repo"])
+    wc_path = os.path.join(CLONE_DIR, "clone_" + suite["repo"])
 
     header = generate_header(suite_name, suite)
     cron_job = generate_main_job(name, suite, log_file, wc_path, cylc_version)