squidient 3.1.0__tar.gz → 3.1.2__tar.gz

{squidient-3.1.0 → squidient-3.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: squidient
-Version: 3.1.0
+Version: 3.1.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.1.0 → squidient-3.1.2}/pyproject.toml

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

{squidient-3.1.0 → squidient-3.1.2}/src/squidient/builds/build_execution.py

@@ -26,6 +26,7 @@ from shlex import quote as shell_quote
 from ..compilation.cmake_options import CMakeOptions
 from ..definitions import (
     alya_dir,
+    build_reproduction_file,
     cmake_link_dir,
     max_jobs_staging,
     remote_bin_dir,
@@ -253,7 +254,7 @@ class BuildExecution(BuildDefinition):
             script.write(module_generator.generate_module_script())
             if self._alias == self._alias_default:
                 script.write("cp " + self._module_path + " " + self._module_dir + "/default\n")
-        configuration = open(self._report_dir + "/config.in", 'w')
+        configuration = open(self._report_dir + "/" + build_reproduction_file, 'w')
         configuration.write("#This file is not actually used to configure squidient\n")
         configuration.write("#You'll find here the commands to manually build alya with the same options as with squidient\n")
         configuration.write("#Execute these commands in the alya root directory\n")

{squidient-3.1.0 → squidient-3.1.2}/src/squidient/data/benchmarks/benchmarks.json

@@ -42,7 +42,7 @@
         "url": "https://alya.gitlab.bsc.es/alya/benchmarks/idom-coarse-22g-11k-div1.git"
     },
     "patient14-27M": {
-        "enabled": true,
+        "enabled": false,
         "type": "ssh",
         "host": "bsc",
         "path": "/gpfs/projects/bsc21/alya_cicd/benchmarks/exmedi/patient14-27M"

{squidient-3.1.0 → squidient-3.1.2}/src/squidient/data/web/monitoring_build.html

@@ -40,7 +40,7 @@
           <th>Version</th>
           <th>Tags</th>
           <th>Modules</th>
-          <th>Configuration</th>
+          <th data-dynatable-column="cmake">CMake</th>
           <th>Job</th>
           <th>Output</th>
           <th>Error</th>
@@ -73,7 +73,7 @@
 
         var rec = [];
         for (var x in b) {
-          b[x].configuration = testsuiteJSON.setUrl(testsuiteJSON.FILE_CONFIG, testsuiteJSON.benchmark_builds + x + "/config.in", null);
+          b[x].cmake = testsuiteJSON.setUrl(testsuiteJSON.FILE_CONFIG, testsuiteJSON.benchmark_builds + x + "/cmake.txt", null);
           b[x].job = testsuiteJSON.setUrl(testsuiteJSON.FILE_CLOUD, testsuiteJSON.benchmark_builds + x + "/JOB.SB", null);
           b[x].output = testsuiteJSON.setUrl(testsuiteJSON.FILE_OK, testsuiteJSON.benchmark_builds + x + "/build.out", null);
           b[x].error = testsuiteJSON.setUrl(testsuiteJSON.FILE_KO, testsuiteJSON.benchmark_builds + x + "/build.err", null);

{squidient-3.1.0 → squidient-3.1.2}/src/squidient/data/web/staging_build.html

@@ -40,7 +40,7 @@
           <th>Version</th>
           <th>Tags</th>
           <th>Modules</th>
-          <th>Configuration</th>
+          <th data-dynatable-column="cmake">CMake</th>
           <th>Job</th>
           <th>Output</th>
           <th>Error</th>
@@ -73,7 +73,7 @@
 
         var rec = [];
         for (var x in b) {
-          b[x].configuration = testsuiteJSON.setUrl(testsuiteJSON.FILE_CONFIG, testsuiteJSON.builds + x + "/config.in", null);
+          b[x].cmake = testsuiteJSON.setUrl(testsuiteJSON.FILE_CONFIG, testsuiteJSON.builds + x + "/cmake.txt", null);
           b[x].job = testsuiteJSON.setUrl(testsuiteJSON.FILE_CLOUD, testsuiteJSON.builds + x + "/JOB.SB", null);
           b[x].output = testsuiteJSON.setUrl(testsuiteJSON.FILE_OK, testsuiteJSON.builds + x + "/build.out", null);
           b[x].error = testsuiteJSON.setUrl(testsuiteJSON.FILE_KO, testsuiteJSON.builds + x + "/build.err", null);

{squidient-3.1.0 → squidient-3.1.2}/src/squidient/definitions.py

@@ -27,6 +27,7 @@ test_max_retry = 3
 report_dir = "reports"
 build_report_dir = report_dir + "/builds"
 benchmark_build_report_dir = report_dir + "/benchmark_builds"
+build_reproduction_file = "cmake.txt"
 benchmark_test_report_dir = report_dir + "/benchmark_tests"
 test_report_dir = report_dir + "/tests"
 cc_report_dir = report_dir + "/cc"

{squidient-3.1.0 → squidient-3.1.2}/src/squidient/testing/benchmarks/failure_notifier.py

@@ -18,7 +18,7 @@
 #########################################################################
 
 from email.message import EmailMessage
-from ...definitions import benchmark_build_report_dir, benchmark_failure_log_files
+from ...definitions import benchmark_build_report_dir, benchmark_failure_log_files, build_reproduction_file
 import mimetypes
 import os
 import re
@@ -194,12 +194,12 @@ class BenchmarkFailureNotifier:
         build = str(instance.get("build", ""))
         if build == "":
             return None
-        path = os.path.join(self.build_report_dir(), build, "config.in")
+        path = os.path.join(self.build_report_dir(), build, build_reproduction_file)
         if not os.path.isfile(path):
             return None
         return {
             "path": path,
-            "filename": self.sanitize_filename(build) + "_config.in",
+            "filename": self.sanitize_filename(build) + "_" + build_reproduction_file,
         }
 
     def build_report_dir(self):