Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DAOS-16070 tools: Include BuildInfo field in version output #14609

Merged
merged 1 commit into from
Jun 26, 2024

Conversation

mjmac
Copy link
Contributor

@mjmac mjmac commented Jun 18, 2024

When available, include more detailed build information in
the version output (most recent tag, etc).

Adds build details to the GetAttachInfo response message in
order to provide server build info to the dmg, daos_agent, and
daos tools (accessible via server-version subcommand).

Features: control
Required-githooks: true
Change-Id: Ia22a6f8007ece7fbf7f801cb9d48826aeae87485
Signed-off-by: Michael MacDonald [email protected]

@mjmac mjmac requested review from a team as code owners June 18, 2024 20:56
@daosbuild1
Copy link
Collaborator

Test stage Python Bandit check completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-14609/1/execution/node/145/log

@mjmac mjmac force-pushed the mjmac/DAOS-16070 branch from a152d2b to 402107f Compare June 18, 2024 21:05
Copy link

Ticket title is 'Add build_info to JSON version output'
Status is 'Open'
https://daosio.atlassian.net/browse/DAOS-16070

@daosbuild1
Copy link
Collaborator

Test stage Python Bandit check completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-14609/2/execution/node/146/log

@mjmac mjmac force-pushed the mjmac/DAOS-16070 branch from 402107f to 2c268c7 Compare June 18, 2024 21:33
@daosbuild1
Copy link
Collaborator

Test stage Python Bandit check completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-14609/3/execution/node/146/log

@mjmac mjmac force-pushed the mjmac/DAOS-16070 branch from 2c268c7 to b18b0b9 Compare June 18, 2024 21:36
@daosbuild1
Copy link
Collaborator

Test stage NLT on EL 8.8 completed with status UNSTABLE. https://build.hpdd.intel.com/job/daos-stack/job/daos//view/change-requests/job/PR-14609/4/testReport/

@daosbuild1
Copy link
Collaborator

Test stage Functional on EL 8.8 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-14609/4/execution/node/1190/log

@mjmac mjmac marked this pull request as draft June 19, 2024 02:11
When available, include more detailed build information in
the version output (most recent tag, etc).

Adds build details to the GetAttachInfo response message in
order to provide server build info to the dmg, daos_agent, and
daos tools (accessible via server-version subcommand).

Features: control
Required-githooks: true
Change-Id: Ia22a6f8007ece7fbf7f801cb9d48826aeae87485
Signed-off-by: Michael MacDonald <[email protected]>
@mjmac mjmac force-pushed the mjmac/DAOS-16070 branch from b18b0b9 to f6cec9d Compare June 19, 2024 19:12
@mjmac mjmac marked this pull request as ready for review June 20, 2024 13:18
@daosbuild1
Copy link
Collaborator

Test stage Functional Hardware Medium completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-14609/5/execution/node/1505/log

def get_build_info():
"""Attempt to retrieve commit/tag details from the build environment."""
try:
cmd = subprocess.run(['git', 'describe', '--tags', '--dirty', '--always'],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be useful if we got all build info here and and spit it to a file and exit when --build-info=write is set and read it from a file if --build-info=read and only automatically get it if --build-info=get (default) or something like that

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll look at doing something like this in a follow-up, to enable build info in a tree without the .git subdirectory.

@@ -62,6 +63,25 @@ func apiVersion() string {
)
}

func srvBuildInfo() (*build.Info, error) {
var major uint32
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: could put all the uint32's on one line

@mjmac
Copy link
Contributor Author

mjmac commented Jun 25, 2024

Test failure is DAOS-15608.

@mjmac mjmac requested a review from a team June 25, 2024 17:46
@mjmac mjmac added the forced-landing The PR has known failures or has intentionally reduced testing, but should still be landed. label Jun 25, 2024
@jolivier23 jolivier23 merged commit 3929be0 into master Jun 26, 2024
50 of 52 checks passed
@jolivier23 jolivier23 deleted the mjmac/DAOS-16070 branch June 26, 2024 20:53
jolivier23 pushed a commit that referenced this pull request Jun 26, 2024
…14645)

When available, include more detailed build information in
the version output (most recent tag, etc).

Adds build details to the GetAttachInfo response message in
order to provide server build info to the dmg, daos_agent, and
daos tools (accessible via server-version subcommand).

Signed-off-by: Michael MacDonald <[email protected]>
grom72 pushed a commit to grom72/daos that referenced this pull request Jul 25, 2024
…ck#14609)

When available, include more detailed build information in
the version output (most recent tag, etc).

Adds build details to the GetAttachInfo response message in
order to provide server build info to the dmg, daos_agent, and
daos tools (accessible via server-version subcommand).

Signed-off-by: Michael MacDonald <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
forced-landing The PR has known failures or has intentionally reduced testing, but should still be landed.
Development

Successfully merging this pull request may close these issues.

5 participants