Skip to content

Commit

Permalink
Merge pull request #1673 from buildtesters/update_configuration_remov…
Browse files Browse the repository at this point in the history
…e_latest_oldest_fields

remove 'latest' and 'oldest' fields from buildtest configuration file
  • Loading branch information
shahzebsiddiqui authored Dec 12, 2023
2 parents 62a52c7 + 2005ebf commit 59b7290
Show file tree
Hide file tree
Showing 16 changed files with 6 additions and 52 deletions.
2 changes: 1 addition & 1 deletion buildtest/builders/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ def shell_detection(self):
self.shell = Shell(
self.recipe.get("shell")
or self.buildexecutor.executors[self.executor]._settings.get("shell")
or 'bash'
or "bash"
)

# set shebang to value defined in Buildspec, if not defined then get one from Shell class
Expand Down
4 changes: 2 additions & 2 deletions buildtest/cli/report.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ def __init__(
self.end = end
self.failure = failure
self.passed = passed
self.latest = latest or self.configuration.target_config["report"].get("latest")
self.oldest = oldest or self.configuration.target_config["report"].get("oldest")
self.latest = latest
self.oldest = oldest
self.filter = filter_args
self.format = format_args or self.configuration.target_config["report"].get(
"format"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,7 @@ system:
#enable terse mode for report
terse: False
format: "name,id,state,runtime,returncode"
# show the latest for every test
latest: True
# show the oldest for every test
oldest: False

compilers:
compiler:
gcc:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@ system:
#enable terse mode for report
terse: False
format: "name,id,state,runtime,returncode"
# show the latest for every test
latest: True
# show the oldest for every test
oldest: False
executors:
local:
bash:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,6 @@ system:
#enable terse mode for report
terse: False
format: "name,id,state,runtime,returncode"
# show the latest for every test
latest: True
# show the oldest for every test
oldest: False
executors:
local:
bash:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@ system:
#enable terse mode for report
terse: False
format: "name,id,state,runtime,returncode"
# show the latest for every test
latest: True
# show the oldest for every test
oldest: False
executors:
defaults:
pollinterval: 10
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@ system:
#enable terse mode for report
terse: False
format: "name,id,state,runtime,returncode"
# show the latest for every test
latest: True
# show the oldest for every test
oldest: False
executors:
defaults:
pollinterval: 10
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@ system:
#enable terse mode for report
terse: False
format: "name,id,state,runtime,returncode"
# show the latest for every test
latest: True
# show the oldest for every test
oldest: False
testdir: /tmp/buildtest
executors:
defaults:
Expand Down
4 changes: 1 addition & 3 deletions buildtest/schemas/settings.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,7 @@
"properties": {
"terse": { "$ref": "#/definitions/terse" },
"format": { "$ref": "#/definitions/format" },
"count": { "$ref": "#/definitions/count" },
"latest": {"type": "boolean", "description": "A boolean to determine whether to show latest test run"},
"oldest": {"type": "boolean", "description": "A boolean to determine whether to show oldest test run"}
"count": { "$ref": "#/definitions/count" }
}
},
"processor": {
Expand Down
4 changes: 0 additions & 4 deletions buildtest/settings/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,6 @@ system:
terse: false
# specify format fields
format: name,id,state,runtime,returncode
# show latest test run
latest: false
# show oldest test run
oldest: false

executors:
local:
Expand Down
4 changes: 0 additions & 4 deletions buildtest/settings/spack_container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ system:
#enable terse mode for report
terse: False
format: "name,id,state,runtime,returncode"
# show the latest for every test
latest: True
# show the oldest for every test
oldest: False

executors:
local:
Expand Down
7 changes: 1 addition & 6 deletions docs/configuring_buildtest/overview.rst
Original file line number Diff line number Diff line change
Expand Up @@ -577,15 +577,10 @@ The ``report`` section in configuration file allows you to configure behavior of
#enable terse mode for report
terse: False
format: "name,id,state,runtime,returncode"
# show the latest for every test
latest: True
# show the oldest for every test
oldest: False
The ``count`` property limits the number of records to display when running ``buildtest report`` command. The ``format`` property
controls the fields to display when running ``buildtest report``. The ``terse`` property enables terse mode for ``buildtest report``.
By default we will show the latest run for each test when running ``buildtest report``. The ``latest`` property can be set to ``False``
if you want to change this behavior.

.. _cdash_configuration:

Expand Down
2 changes: 0 additions & 2 deletions tests/settings/ascent.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ system:
count: 25
terse: False
format: "name,id,state,runtime,returncode"
latest: False
oldest: False
executors:
defaults:
pollinterval: 30
Expand Down
2 changes: 0 additions & 2 deletions tests/settings/jlse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ system:
count: 25
terse: False
format: "name,id,state,runtime,returncode"
latest: False
oldest: False
executors:
defaults:
pollinterval: 30
Expand Down
2 changes: 0 additions & 2 deletions tests/settings/nersc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ system:
count: 25
terse: False
format: "name,id,state,runtime,returncode"
latest: False
oldest: False
compilers:
enable_prgenv: true
prgenv_modules:
Expand Down
2 changes: 0 additions & 2 deletions tests/settings/pbs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ system:
count: 25
terse: False
format: "name,id,state,runtime,returncode"
latest: False
oldest: False
executors:
defaults:
pollinterval: 5
Expand Down

0 comments on commit 59b7290

Please sign in to comment.