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.

Sign up for GitHub

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

Jump to bottom

DAOS-15997 build: bump mercury version to 2.4.0rc4 #14873

Merged
merged 1 commit into from
Aug 6, 2024
Merged

DAOS-15997 build: bump mercury version to 2.4.0rc4 #14873

merged 1 commit into from
Aug 6, 2024

Conversation

soumagne
Copy link
Collaborator

@soumagne soumagne commented Aug 5, 2024

Required-githooks: true

PR-repos: mercury@PR-116:lastBuild

Before requesting gatekeeper:

  • Two review approvals and any prior change requests have been resolved.
  • Testing is complete and all tests passed or there is a reason documented in the PR why it should be force landed and forced-landing tag is set.
  • Features: (or Test-tag*) commit pragma was used or there is a reason documented that there are no appropriate tags for this PR.
  • Commit messages follows the guidelines outlined here.
  • Any tests skipped by the ticket being addressed have been run and passed in the PR.

Gatekeeper:

  • You are the appropriate gatekeeper to be landing the patch.
  • The PR has 2 reviews by people familiar with the code, including appropriate owners.
  • Githooks were used. If not, request that user install them and check copyright dates.
  • Checkpatch issues are resolved. Pay particular attention to ones that will show up on future PRs.
  • All builds have passed. Check non-required builds for any new compiler warnings.
  • Sufficient testing is done. Check feature pragmas and test tags and that tests skipped for the ticket are run and now pass with the changes.
  • If applicable, the PR has addressed any potential version compatibility issues.
  • Check the target branch. If it is master branch, should the PR go to a feature branch? If it is a release branch, does it have merge approval in the JIRA ticket.
  • Extra checks if forced landing is requested
    • Review comments are sufficiently resolved, particularly by prior reviewers that requested changes.
    • No new NLT or valgrind warnings. Check the classic view.
    • Quick-build or Quick-functional is not used.
  • Fix the commit message upon landing. Check the standard here. Edit it to create a single commit. If necessary, ask submitter for a new summary.

@github-actions GitHub Actions
Copy link

github-actions bot commented Aug 5, 2024

Ticket title is 'Update mercury to 2.4.0'
Status is 'In Progress'
https://daosio.atlassian.net/browse/DAOS-15997

@soumagne
DAOS-15997 build: bump mercury version to 2.4.0rc4
4320e9c 
Required-githooks: true

Allow-unstable-test: true

PR-repos: mercury@PR-116:lastBuild

Signed-off-by: Jerome Soumagne <jerome.soumagne@intel.com>
@soumagne soumagne force-pushed the soumagne/mercury_240 branch from 5f05051 to 4320e9c Compare August 5, 2024 19:56
@soumagne soumagne marked this pull request as ready for review August 6, 2024 15:36
@soumagne soumagne requested a review from a team as a code owner August 6, 2024 15:36
frostedcmos
frostedcmos reviewed Aug 6, 2024
View reviewed changes
utils/rpms/daos.spec
@@ -3,7 +3,7 @@
%define agent_svc_name daos_agent.service
%define sysctl_script_name 10-daos_server.conf

%global mercury_version 2.3.1-1%{?dist}
%global mercury_version 2.4
Copy link
Contributor

Choose a reason for hiding this comment

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

hmm.. how does this know to pick rc4 specifically? Doesnt this need to be 2.4.0rc4-1 here?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

it does not need to be explicit, I just want whatever is above 2.4

Copy link
Contributor

Choose a reason for hiding this comment

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

it does not need to be explicit, I just want whatever is above 2.4

Excellent! This is what I like to see. But just to make doubly sure you are getting what you want:

daos/utils/rpms/daos.spec

Line 31 in 4320e9c

BuildRequires: mercury-devel >= %{mercury_version}

means you will be getting whatever is equal to or above 2.4. I suspect that is what you want, but wanted to point it out just in case.

Copy link
Collaborator Author

@soumagne soumagne Aug 6, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

yes this is what I want, thanks for double checking :)

@frostedcmos frostedcmos self-requested a review August 6, 2024 17:48
@soumagne soumagne requested a review from a team August 6, 2024 19:59
@soumagne
Copy link
Collaborator Author

soumagne commented Aug 6, 2024

@daos-stack/daos-gatekeeper please first merge daos-stack/mercury#116 before merging this PR.

@mchaarawi mchaarawi merged commit d736de1 into master Aug 6, 2024
55 checks passed
@mchaarawi mchaarawi deleted the soumagne/mercury_240 branch August 6, 2024 20:02
soumagne added a commit that referenced this pull request Aug 6, 2024
@soumagne
DAOS-15997 build: bump mercury version to 2.4.0rc4 (#14873)
d51f2cf 
Required-githooks: true

Signed-off-by: Jerome Soumagne <jerome.soumagne@intel.com>
soumagne added a commit that referenced this pull request Aug 7, 2024
@soumagne
DAOS-15997 build: bump mercury version to 2.4.0rc4 (#14873)
b5fe4ce 
Required-githooks: true

Signed-off-by: Jerome Soumagne <jerome.soumagne@intel.com>
daltonbohning pushed a commit that referenced this pull request Aug 7, 2024
@soumagne
DAOS-15997 build: bump mercury version to 2.4.0rc4 (#14873) (#14883)
3f0d0d1 
Signed-off-by: Jerome Soumagne <jerome.soumagne@intel.com>
Nasf-Fan pushed a commit that referenced this pull request Aug 8, 2024
@soumagne @Nasf-Fan
DAOS-15997 build: bump mercury version to 2.4.0rc4 (#14873) (#14883)
85c63df 
Signed-off-by: Jerome Soumagne <jerome.soumagne@intel.com>
@cdavis28 cdavis28 mentioned this pull request Aug 12, 2024
Merged
@mjmac mjmac mentioned this pull request Nov 13, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@brianjmurrell brianjmurrell brianjmurrell approved these changes

@frostedcmos frostedcmos frostedcmos approved these changes

@jgmoore-or jgmoore-or Awaiting requested review from jgmoore-or

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@soumagne @brianjmurrell @frostedcmos @mchaarawi