GNU bug report logs - #74769
[PATCH Cuirass 0/4] Forgejo event support

Previous Next

Full log

Message #32 received at 74769 <at> debbugs.gnu.org (full text, mbox):

From: Romain GARBAGE <romain.garbage <at> inria.fr>
To: 74769 <at> debbugs.gnu.org
Cc: ludovic.courtes <at> inria.fr, Romain GARBAGE <romain.garbage <at> inria.fr>
Subject: [PATCH Cuirass v2 4/7] forges: Define default values for
 specifications.
Date: Thu, 12 Dec 2024 16:57:52 +0100

* src/cuirass/forges.scm (%default-jobset-options-period,
%default-jobset-options-priority, %default-jobset-options-systems): New
variables.
* src/cuirass/forges/gitlab.scm (gitlab-merge-request->specification),
tests/gitlab.scm: Change hardcoded values to variables defined in the forges
module.
---
 src/cuirass/forges.scm        | 16 +++++++++++++++-
 src/cuirass/forges/gitlab.scm |  6 +++---
 tests/gitlab.scm              | 21 +++++++++++----------
 3 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/src/cuirass/forges.scm b/src/cuirass/forges.scm
index c05e266..56f4876 100644
--- a/src/cuirass/forges.scm
+++ b/src/cuirass/forges.scm
@@ -20,7 +20,11 @@
   #:use-module (cuirass specification)
   #:use-module (json)
   #:use-module (ice-9 match)
-  #:export (make-jobset-options
+  #:export (%default-jobset-options-period
+            %default-jobset-options-priority
+            %default-jobset-options-systems
+
+            make-jobset-options
             jobset-options?
             json->jobset-options
             jobset-options-name-prefix
@@ -36,6 +40,16 @@
 ;;;
 ;;; Code:
 
+;; Default polling period for jobsets created using a forge module.
+(define %default-jobset-options-period 3600)
+
+;; Default priority for jobsets created using a forge module.
+(define %default-jobset-options-priority 5)
+
+;; Default target systems for jobsets created using a forge module.
+(define %default-jobset-options-systems
+  (list "x86_64-linux"))
+
 ;; This mapping defines a specific JSON dictionary used for tweaking Cuirass
 ;; options. It is not included in the JSON data sent by default by Gitlab and
 ;; must be used through the custom template mechanism (see documentation).
diff --git a/src/cuirass/forges/gitlab.scm b/src/cuirass/forges/gitlab.scm
index 56e875a..de2216f 100644
--- a/src/cuirass/forges/gitlab.scm
+++ b/src/cuirass/forges/gitlab.scm
@@ -123,15 +123,15 @@
          (period (if (and cuirass-options
                           (jobset-options-period cuirass-options))
                      (jobset-options-period cuirass-options)
-                     3600))
+                     %default-jobset-options-period))
          (priority (if (and cuirass-options
                             (jobset-options-priority cuirass-options))
                        (jobset-options-priority cuirass-options)
-                       1))
+                       %default-jobset-options-priority))
          (systems (if (and cuirass-options
                            (jobset-options-systems cuirass-options))
                       (jobset-options-systems cuirass-options)
-                      (list "x86_64-linux"))))
+                      %default-jobset-options-systems)))
     (specification
      (name spec-name)
      (build build)
diff --git a/tests/gitlab.scm b/tests/gitlab.scm
index df221bf..3409413 100644
--- a/tests/gitlab.scm
+++ b/tests/gitlab.scm
@@ -16,7 +16,8 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with Cuirass.  If not, see <http://www.gnu.org/licenses/>.
 
-(use-modules (cuirass forges gitlab)
+(use-modules (cuirass forges)
+             (cuirass forges gitlab)
              (cuirass specification)
              (cuirass utils)
              (tests common)
@@ -172,9 +173,9 @@
              (url "https://gitlab.instance.test/source-repo/fork-name.git")
              (branch "test-branch"))
             %default-channels))
-    (priority 1)
-    (period 3600)
-    (systems (list "x86_64-linux")))))
+    (priority %default-jobset-options-priority)
+    (period %default-jobset-options-period)
+    (systems %default-jobset-options-systems))))
 
 (test-assert "custom-json"
   (specifications=?
@@ -211,9 +212,9 @@
              (url "https://gitlab.instance.test/source-repo/fork-name.git")
              (branch "test-branch"))
             %default-channels))
-    (priority 1)
-    (period 3600)
-    (systems (list "x86_64-linux")))))
+    (priority %default-jobset-options-priority)
+    (period %default-jobset-options-period)
+    (systems %default-jobset-options-systems))))
 
 (test-assert "custom-json-name-prefix"
   (specifications=?
@@ -230,9 +231,9 @@
              (url "https://gitlab.instance.test/source-repo/fork-name.git")
              (branch "test-branch"))
             %default-channels))
-    (priority 1)
-    (period 3600)
-    (systems (list "x86_64-linux")))))
+    (priority %default-jobset-options-priority)
+    (period %default-jobset-options-period)
+    (systems %default-jobset-options-systems))))
 
 (test-assert "custom-json-build-all"
   (specifications=?
-- 
2.46.0

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.