squidient 3.3.0__tar.gz → 3.4.2__tar.gz

{squidient-3.3.0 → squidient-3.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: squidient
-Version: 3.3.0
+Version: 3.4.2
 Summary: CI/CD framework for alya
 Project-URL: Homepage, https://alya.gitlab.bsc.es/alya/ci-cd/squidient
 Project-URL: Bug Tracker, https://alya.gitlab.bsc.es/alya/ci-cd/squidient/issues

{squidient-3.3.0 → squidient-3.4.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "squidient"
-version = "3.3.0"
+version = "3.4.2"
 authors = [
   { name="Damien Dosimont", email="damien.dosimont@gmail.com" },
 ]

{squidient-3.3.0 → squidient-3.4.2}/src/squidient/builds/benchmark_build_execution.py

@@ -30,6 +30,7 @@ class BenchmarkBuildExecution(BuildExecution):
     def __init__(self, system_manager, run_id, build_id, job, ssh, config, report_directory, db):
         super().__init__(system_manager, run_id, build_id, job, ssh, config, report_directory)
         self._queue_type = "benchmarks"
+        self._account = self._system_platform.get_account(self._queue_type)
         self._db = db
         self._max_jobs = max_jobs_monitoring
 

{squidient-3.3.0 → squidient-3.4.2}/src/squidient/builds/build_execution.py

@@ -90,7 +90,7 @@ class BuildExecution(BuildDefinition):
         self._queue = ""
         self._slurm_flag = ""
         self._exclusive = False
-        self._account = self._system_platform.get_account()
+        self._account = self._system_platform.get_account(self._queue_type)
 
         self._options = None
         self._job_id = ""

{squidient-3.3.0 → squidient-3.4.2}/src/squidient/configure.py

@@ -459,15 +459,16 @@ def gitlab_config(pipeline, directory, alya_ref, alya_branch, flex=False, system
             console.error("Project " + project + " not found", level=1)
             raise RuntimeError("Project " + project + " not found")
         config_project = config_project[project]
+        enable_benchmark_queues = _project_benchmark_queues_are_enabled(project, build_selection_type)
         for platform in config_project["systems"][system]["platforms"]:
             if platform in config["systems"][system]["platforms"]:
-                if "account" in config_project["systems"][system]["platforms"][platform]:
-                    config["systems"][system]["platforms"][platform]["account"] = (
-                        config_project)["systems"][system]["platforms"][platform]["account"]
-                for queue in config_project["systems"][system]["platforms"][platform]["queues"]:
-                    if queue in config["systems"][system]["platforms"][platform]["queues"]:
-                        config["systems"][system]["platforms"][platform]["queues"][queue] = (
-                            config_project)["systems"][system]["platforms"][platform]["queues"][queue]
+                platform_config = config["systems"][system]["platforms"][platform]
+                project_platform_config = config_project["systems"][system]["platforms"][platform]
+                _apply_project_platform_config(
+                    platform_config,
+                    project_platform_config,
+                    enable_benchmark_queues=enable_benchmark_queues,
+                )
 
         console.step("Saving")
         save_json(config, config_file)
@@ -479,6 +480,46 @@ def gitlab_config(pipeline, directory, alya_ref, alya_branch, flex=False, system
     set_version()
 
 
+def _project_benchmark_queues_are_enabled(project_name, build_selection_type):
+    return (
+        project_name is not None
+        and project_name.startswith("eurohpc")
+        and build_selection_type == "mr"
+    )
+
+
+def _project_queues_for_platform(platform_config, project_platform_config, enable_benchmark_queues=False):
+    project_queues = dict(project_platform_config["queues"])
+    if (
+        enable_benchmark_queues
+        and "benchmarks" in platform_config["queues"]
+        and "benchmarks" not in project_queues
+        and "default" in project_queues
+    ):
+        project_queues["benchmarks"] = project_queues["default"]
+    return project_queues
+
+
+def _apply_project_platform_config(platform_config, project_platform_config, enable_benchmark_queues=False):
+    project_queues = _project_queues_for_platform(
+        platform_config,
+        project_platform_config,
+        enable_benchmark_queues=enable_benchmark_queues,
+    )
+
+    if "account" in project_platform_config:
+        for queue in platform_config["queues"]:
+            if queue in project_queues:
+                continue
+            platform_config.setdefault("queueAccounts", {})
+            platform_config["queueAccounts"].setdefault(queue, platform_config["account"])
+        platform_config["account"] = project_platform_config["account"]
+
+    for queue, project_queue in project_queues.items():
+        if queue in platform_config["queues"]:
+            platform_config["queues"][queue] = project_queue
+
+
 def set_mr(mr_type):
     if mr_type is not None:
         if mr_type == "mr":

{squidient-3.3.0 → squidient-3.4.2}/src/squidient/data/configurations/projects.json

@@ -8,7 +8,6 @@
                         "queues": {
                             "builds": "gp_ehpc",
                             "tests": "gp_ehpc",
-                            "benchmarks": "gp_ehpc",
                             "flex": "gp_ehpc",
                             "install": "gp_ehpc",
                             "default": "gp_ehpc"
@@ -47,5 +46,34 @@
                 }
             }
         }
+    },
+    "eurohpc-hybrid": {
+        "systems": {
+            "bsc": {
+                "platforms": {
+                    "gpp": {
+                        "account": "",
+                        "queues": {
+                            "builds": "gp_ehpc",
+                            "tests": "gp_ehpc",
+                            "flex": "gp_ehpc",
+                            "install": "gp_ehpc",
+                            "default": "gp_ehpc"
+                        }
+                    },
+                    "acc": {
+                        "account": "ehpc640",
+                        "queues": {
+                            "builds": "acc_ehpc",
+                            "tests": "acc_ehpc",
+                            "benchmarks": "acc_ehpc",
+                            "flex": "acc_ehpc",
+                            "install": "acc_ehpc",
+                            "default": "acc_ehpc"
+                        }
+                    }
+                }
+            }
+        }
     }
 }

{squidient-3.3.0 → squidient-3.4.2}/src/squidient/systems/platform.py

@@ -36,6 +36,7 @@ class Platform(System):
         self._account = platform_config["account"]
         if self._account == "":
             self._account = None
+        self._queue_accounts = platform_config.get("queueAccounts", {})
         self._threads = platform_config["jobThreads"]
         self._test_max_tasks = platform_config["testMaxTasks"]
 
@@ -124,7 +125,12 @@ class Platform(System):
         if "sshKey" in platform_config and platform_config["sshKey"] != "":
             self._ssh_key = platform_config["sshKey"]
 
-    def get_account(self):
+    def get_account(self, queue_type=None):
+        if queue_type in self._queue_accounts:
+            account = self._queue_accounts[queue_type]
+            if account == "":
+                return None
+            return account
         return self._account
 
     def is_queue_valid(self, queue, size, timeout):

{squidient-3.3.0 → squidient-3.4.2}/src/squidient/testing/benchmarks/instance.py

@@ -30,6 +30,7 @@ class BenchmarkInstance(Instance):
         super().__init__(system_manager, run_id, name, job, ssh, test_definition, config, build, execution, test_path, json_path, report_dir,
                          remote_dir, source_dir)
         self._queue_type = "benchmarks"
+        self._account = self._system_platform.get_account(self._queue_type)
         self._max_jobs = max_jobs_monitoring
 
         self._db = db

{squidient-3.3.0 → squidient-3.4.2}/src/squidient/testing/cases/instance.py

@@ -85,7 +85,7 @@ class Instance:
         self._config = config
 
         self._server_path = self._system_manager.get_system(self._system).get_path()
-        self._account = self._system_platform.get_account()
+        self._account = self._system_platform.get_account(self._queue_type)
 
         if source_dir is not None:
             self._source_path = self._server_path + "/" + source_dir

{squidient-3.3.0 → squidient-3.4.2}/src/squidient/testing/cases/instance_merger.py

@@ -46,7 +46,7 @@ class InstanceMerger:
         self._config = config
 
         self._server_path = self._system_manager.get_system(self._system).get_path()
-        self._account = self._system_platform.get_account()
+        self._account = self._system_platform.get_account(self._queue_type)
         self._tasks = 0
         self._timeout = "00:00:00"
         offset = self._system_platform.get_timeoffset()