Merge pull request #1458 from buildtesters/move_purge_settings

Move purge settings to top-level in configuration file
buildtesters · Apr 28, 2023 · d9fe213 · d9fe213
2 parents 0cd3e13 + daf7ef8
commit d9fe213
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 11 deletions.
diff --git a/buildtest/cli/buildspec.py b/buildtest/cli/buildspec.py
@@ -84,9 +84,7 @@ def __init__(
             "buildspecs"
         ].get("formatfields")
         self.header = header
-        self.pager = pager or self.configuration.target_config["buildspecs"].get(
-            "pager"
-        )
+        self.pager = pager or self.configuration.target_config.get("pager")
         self.count = count or self.configuration.target_config["buildspecs"].get(
             "count"
         )

diff --git a/buildtest/schemas/settings.schema.json b/buildtest/schemas/settings.schema.json
@@ -67,6 +67,11 @@
           "minimum": 1,
           "description": "Specify timeout duration in number of seconds"
         },
+        "pager":
+          {
+            "type": "boolean",
+            "description": "A boolean to determine whether to enable paging when viewing buildspec cache"
+          },
         "buildspecs":
         {
           "type": "object",
@@ -90,11 +95,6 @@
               "type": "boolean",
               "description": "A boolean to determine whether to enable terse mode when viewing buildspec cache"
             },
-            "pager":
-            {
-              "type": "boolean",
-              "description": "A boolean to determine whether to enable paging when viewing buildspec cache"
-            },
             "root": {
               "type": "array",
               "items": {

diff --git a/buildtest/settings/config.yml b/buildtest/settings/config.yml
@@ -14,6 +14,9 @@ system:
     # pool size for parallel processing using multiprocessing.Pool. Pool Size must be 1 or higher. The pool size is calculated as follows: poolsize = min(poolsize, os.cpu_count())
     poolsize: 1
 
+    # determine whether to enable pagination
+    pager: False
+
     buildspecs:
       # whether to rebuild cache file automatically when running `buildtest buildspec find`
       rebuild: False
@@ -23,8 +26,7 @@ system:
       formatfields: "name,description"
       # enable terse mode
       terse: False
-      # determine whether to enable pagination
-      pager: False
+
       # specify list of directories to search for buildspecs when building cache
       #root: [ $BUILDTEST_ROOT/examples, /tmp/buildspecs ]
     executors:

diff --git a/buildtest/settings/spack_container.yml b/buildtest/settings/spack_container.yml
@@ -5,7 +5,15 @@ system:
     description: Generic System
     moduletool: lmod
     testdir: "~/runs"
-    buildspec_roots: [$BUILDTEST_ROOT/examples]
+    pager: False
+
+    buildspecs:
+      rebuild: False
+      count: 15
+      formatfields: "name,description"
+      terse: False
+      root: [$BUILDTEST_ROOT/examples]
+
     executors:
       local:
         bash:

diff --git a/tests/settings/ascent.yml b/tests/settings/ascent.yml
@@ -3,6 +3,7 @@ system:
     hostnames:
     - login1.ascent.olcf.ornl.gov
     moduletool: lmod
+    pager: False
     executors:
       defaults:
         pollinterval: 30

diff --git a/tests/settings/jlse.yml b/tests/settings/jlse.yml
@@ -3,6 +3,7 @@ system:
     hostnames:
     - jlselogin*
     moduletool: environment-modules
+    pager: False
     executors:
       defaults:
         pollinterval: 30

diff --git a/tests/settings/nersc.yml b/tests/settings/nersc.yml
@@ -2,6 +2,7 @@ system:
   perlmutter:
     hostnames: ["login*"]
     moduletool: lmod
+    pager: False
     compilers:
       enable_prgenv: true
       prgenv_modules:

diff --git a/tests/settings/pbs.yml b/tests/settings/pbs.yml
@@ -2,6 +2,7 @@ system:
   generic:
     hostnames: ['.*']
     moduletool: N/A
+    pager: False
     executors:
       defaults:
         pollinterval: 5