DAOS-623 build: add a linter to normalize config by jolivier23 · Pull Request #17781 · daos-stack/daos

jolivier23 · 2026-03-24T17:12:15Z

Ensures entries are alphabetized
Ensures names are lowercase

Change-Id: I9d8839df99c4e2930067483fa760b9ef5c9c2b2a

Steps for the author:

Commit message follows the guidelines.
Appropriate Features or Test-tag pragmas were used.
Appropriate Functional Test Stages were run.
At least two positive code reviews including at least one code owner from each category referenced in the PR.
Testing is complete. If necessary, forced-landing label added and a reason added in a comment.

After all prior steps are complete:

Gatekeeper requested (daos-gatekeeper added as a reviewer).

Change-Id: I9d8839df99c4e2930067483fa760b9ef5c9c2b2a Signed-off-by: Jeff Olivier <jeffolivier@google.com>

Change-Id: I0ad1c874a84b6153daa6a36d0ebdd62bbb22b0ff Signed-off-by: Jeff Olivier <jeffolivier@google.com>

daosbuild3 · 2026-03-24T17:24:51Z

Test stage NLT completed with status FAILURE. https://jenkins-3.daos.hpc.amslabs.hpecorp.net/job/daos-stack/job/daos/job/PR-17781/1/display/redirect

daosbuild3 · 2026-03-24T17:24:54Z

Test stage Unit Test with memcheck completed with status FAILURE. https://jenkins-3.daos.hpc.amslabs.hpecorp.net/job/daos-stack/job/daos/job/PR-17781/1/display/redirect

daosbuild3 · 2026-03-24T17:24:59Z

Test stage Unit Test bdev with memcheck completed with status FAILURE. https://jenkins-3.daos.hpc.amslabs.hpecorp.net/job/daos-stack/job/daos/job/PR-17781/1/display/redirect

daosbuild3 · 2026-03-24T17:25:05Z

Test stage Unit Test bdev completed with status FAILURE. https://jenkins-3.daos.hpc.amslabs.hpecorp.net/job/daos-stack/job/daos/job/PR-17781/1/display/redirect

github-actions · 2026-03-24T18:15:56Z

Ticket title is 'Generic ticket for minor code cleanup and improvement'
Status is 'Resolved'
Labels: 'request_for_2.6.5,request_for_2.6.6,request_for_2.8,scrubbed_2.6.5'
Job should run at elevated priority (1)
https://daosio.atlassian.net/browse/DAOS-623

…list Change-Id: I736674b78af5bd4aa239fe079b649623e7c8fbb3

Change-Id: I5129d21e31cfc5d15bf49d5623d190e04181416f Signed-off-by: Jeff Olivier <jeffolivier@google.com>

…list Change-Id: I0de0103c93b60b70d9feaa5103da27338561d1b9

Change-Id: I26aa812984e9d2ebe0985f405b8bdc14582942a9 Signed-off-by: Jeff Olivier <jeffolivier@google.com>

…list Change-Id: I0d7ee2cd0d08eceafbc4fa0cb091aa3c34edbb51

Change-Id: I200e9006b2bc23733fc4e688d1b449b1619f5aac Signed-off-by: Jeff Olivier <jeffolivier@google.com>

daltonbohning · 2026-04-08T15:22:31Z

utils/githooks/pre-commit.d/80-build.config.sh

+# Use python to perform the check and fix
+python3 - <<EOF


Why not put this in a python file instead?

gemini wrote the script...who am I to question my overlord? Though you make a good point. Maybe the whole script should be python. Let me play with it.

Ok, I reworked it in python. Even added some tests. A few of my own tests seem to work.

…list Change-Id: I0006a16e7f1c8d8395b094fc944bb413d8e5b2db

Change-Id: I566f13f8c0988b85b8a44b2d9bed88486769511d Signed-off-by: Jeff Olivier <jeffolivier@google.com>

daosbuild3 · 2026-04-09T14:39:43Z

Test stage Python Bandit check completed with status FAILURE. https://jenkins-3.daos.hpc.amslabs.hpecorp.net//job/daos-stack/job/daos/view/change-requests/job/PR-17781/6/execution/node/136/log

Change-Id: Ibfc442d09482a4c33e01ca9f98fafd4ee180682a Signed-off-by: Jeff Olivier <jeffolivier@google.com>

Change-Id: I2dd33c8bd57883467c70261b01e39ae3b5895819 Signed-off-by: Jeff Olivier <jeffolivier@google.com>

Change-Id: Iee193632aaa43209b7bef689930127db34c0d644 Signed-off-by: Jeff Olivier <jeffolivier@google.com>

…list Change-Id: I3440bae491e159b0bde5d9304d69d021027a95b9

daosbuild3 · 2026-04-09T17:05:47Z

Test stage Unit Test bdev with memcheck completed with status FAILURE. https://jenkins-3.daos.hpc.amslabs.hpecorp.net/job/daos-stack/job/daos/job/PR-17781/8/display/redirect

Change-Id: I359022d6bf66cf047d59a3519229b6ae968e8daf Signed-off-by: Jeff Olivier <jeffolivier@google.com>

Change-Id: I7cd818494d6d8b53256f22f8c9c357c983dd2362 Signed-off-by: Jeff Olivier <jeffolivier@google.com>

jolivier23 · 2026-04-09T17:25:04Z

utils/build.config

@@ -1,31 +1,28 @@
-[component]
-component=daos


This is holdover from when scons_local supported cart, daos, cppr, and iof independently

daltonbohning · 2026-04-10T16:29:19Z

utils/githooks/pre-commit.d/80-build.config.py

+def print_githook_header(name):
+    """Print the standard git hook header."""
+    print(f"{name + ':':<17} ", end='', flush=True)
+
+
+def git_diff_cached_files(file_path):
+    """Check if the file has staged changes."""
+    target = os.environ.get('TARGET')
+    if not target:
+        # If TARGET is not set, we can't easily determine what to diff against
+        # in the same way hook_base.sh does. For now, we'll return True to
+        # force a check if we're not sure, or try to find a base.
+        return True
+
+    cmd = ['git', 'diff', target, '--cached', '--name-only', '--diff-filter=d', '--', file_path]
+    result = subprocess.run(
+        cmd, capture_output=True, text=True, check=False,
+        shell=False)  # nosec B603
+    return result.stdout.strip()


Does it not work in the env to call the bash equivalents for these functions?

Sorry, I'm not sure which functions you are referring to here. Maybe commented on a different line than you wanted?

I mean instead of writing print_githook_header can we not call the bash function for it?

The short answer is the bash function is defined in hook_base.sh and not visible to python. And it's a one-liner. Maybe what we should do is create a python library to do what the bash scripts do and then we could invoke python from bash :-)

…list Change-Id: I7dca976027d822b8eee19faa4fad9e6af430af60

Change-Id: I5156238fea520e7b921aa02e107ea39f23407b51 Signed-off-by: Jeff Olivier <jeffolivier@google.com>

DAOS-623 build: add a linter to normalize config

c079815

Change-Id: I9d8839df99c4e2930067483fa760b9ef5c9c2b2a Signed-off-by: Jeff Olivier <jeffolivier@google.com>

jolivier23 requested review from grom72 and soumagne March 24, 2026 17:13

soumagne previously approved these changes Mar 24, 2026

View reviewed changes

add a change

27bd41c

Change-Id: I0ad1c874a84b6153daa6a36d0ebdd62bbb22b0ff Signed-off-by: Jeff Olivier <jeffolivier@google.com>

jolivier23 dismissed soumagne’s stale review via 27bd41c March 24, 2026 17:23

github-actions bot added the priority Ticket has high priority (automatically managed) label Mar 24, 2026

jolivier23 requested a review from soumagne March 24, 2026 18:35

soumagne previously approved these changes Mar 24, 2026

View reviewed changes

jolivier23 added 6 commits March 25, 2026 13:34

Merge remote-tracking branch 'comm/master' into jvolivie/buildconfig_…

8b5a47a

…list Change-Id: I736674b78af5bd4aa239fe079b649623e7c8fbb3

post merge commit

5fffdf3

Change-Id: I5129d21e31cfc5d15bf49d5623d190e04181416f Signed-off-by: Jeff Olivier <jeffolivier@google.com>

Merge remote-tracking branch 'comm/master' into jvolivie/buildconfig_…

47535c4

…list Change-Id: I0de0103c93b60b70d9feaa5103da27338561d1b9

post merge commit

952401c

Change-Id: I26aa812984e9d2ebe0985f405b8bdc14582942a9 Signed-off-by: Jeff Olivier <jeffolivier@google.com>

Merge remote-tracking branch 'comm/master' into jvolivie/buildconfig_…

dcca903

…list Change-Id: I0d7ee2cd0d08eceafbc4fa0cb091aa3c34edbb51

Fix copyright, change extension

bd00143

Change-Id: I200e9006b2bc23733fc4e688d1b449b1619f5aac Signed-off-by: Jeff Olivier <jeffolivier@google.com>

jolivier23 dismissed soumagne’s stale review via bd00143 April 8, 2026 14:57

jolivier23 requested review from daltonbohning and soumagne April 8, 2026 14:57

daltonbohning previously approved these changes Apr 8, 2026

View reviewed changes

jolivier23 added 2 commits April 9, 2026 08:15

Merge remote-tracking branch 'comm/master' into jvolivie/buildconfig_…

29e4603

…list Change-Id: I0006a16e7f1c8d8395b094fc944bb413d8e5b2db

Change to python script entirely, add tests

96222e8

Change-Id: I566f13f8c0988b85b8a44b2d9bed88486769511d Signed-off-by: Jeff Olivier <jeffolivier@google.com>

jolivier23 dismissed daltonbohning’s stale review via 96222e8 April 9, 2026 14:37

jolivier23 requested a review from daltonbohning April 9, 2026 14:39

Address bandit warnings

7f9ef6f

Change-Id: Ibfc442d09482a4c33e01ca9f98fafd4ee180682a Signed-off-by: Jeff Olivier <jeffolivier@google.com>

jolivier23 added 3 commits April 9, 2026 09:58

sort modules

6802dfd

Change-Id: I2dd33c8bd57883467c70261b01e39ae3b5895819 Signed-off-by: Jeff Olivier <jeffolivier@google.com>

spelling

7029d44

Change-Id: Iee193632aaa43209b7bef689930127db34c0d644 Signed-off-by: Jeff Olivier <jeffolivier@google.com>

Merge remote-tracking branch 'comm/master' into jvolivie/buildconfig_…

d780627

…list Change-Id: I3440bae491e159b0bde5d9304d69d021027a95b9

jolivier23 added 2 commits April 9, 2026 11:06

post merge commit

a83411b

Change-Id: I359022d6bf66cf047d59a3519229b6ae968e8daf Signed-off-by: Jeff Olivier <jeffolivier@google.com>

Fix some issues

6b6d647

Change-Id: I7cd818494d6d8b53256f22f8c9c357c983dd2362 Signed-off-by: Jeff Olivier <jeffolivier@google.com>

jolivier23 commented Apr 9, 2026

View reviewed changes

daltonbohning reviewed Apr 10, 2026

View reviewed changes

jolivier23 requested a review from daltonbohning April 10, 2026 19:38

jolivier23 added 2 commits April 10, 2026 14:57

Merge remote-tracking branch 'comm/master' into jvolivie/buildconfig_…

639c26f

…list Change-Id: I7dca976027d822b8eee19faa4fad9e6af430af60

post merge commit

06ab20d

Change-Id: I5156238fea520e7b921aa02e107ea39f23407b51 Signed-off-by: Jeff Olivier <jeffolivier@google.com>

		@@ -1,31 +1,28 @@
		[component]
		component=daos

Conversation

jolivier23 commented Mar 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Steps for the author:

After all prior steps are complete:

Uh oh!

daosbuild3 commented Mar 24, 2026

Uh oh!

daosbuild3 commented Mar 24, 2026

Uh oh!

daosbuild3 commented Mar 24, 2026

Uh oh!

daosbuild3 commented Mar 24, 2026

Uh oh!

github-actions bot commented Mar 24, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

daosbuild3 commented Apr 9, 2026

Uh oh!

daosbuild3 commented Apr 9, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

4 participants

jolivier23 commented Mar 24, 2026 •

edited

Loading