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-15596 pkg: Update argobots to 1.2 #15181

Merged
merged 8 commits into from
Oct 15, 2024
Merged

DAOS-15596 pkg: Update argobots to 1.2 #15181

merged 8 commits into from
Oct 15, 2024

Conversation

knard-intel
Copy link
Contributor

@knard-intel knard-intel commented Sep 24, 2024 •
edited
Loading

Description

Update argopbots dependency to 1.2 release

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 Sep 24, 2024 •
edited
Loading

Ticket title is 'Update Argobots to 1.2'
Status is 'In Review'
Errors are Unknown component
https://daosio.atlassian.net/browse/DAOS-15596

@daosbuild1
Copy link
Collaborator

Test stage Build RPM on EL 9 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-15181/1/execution/node/273/log

@daosbuild1
Copy link
Collaborator

Test stage Build RPM on EL 8 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-15181/1/execution/node/354/log

@daosbuild1
Copy link
Collaborator

Test stage Build RPM on Leap 15.5 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-15181/1/execution/node/304/log

@daosbuild1
Copy link
Collaborator

Test stage Build DEB on Ubuntu 20.04 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-15181/1/execution/node/357/log

@kanard38 @knard-intel
DAOS-15596 pkg: Update argobots to 1.2
861445b 
Update argobots dependency to 1.2 release

PR-repos: argobots@PR-26:12
Required-githooks: true
Signed-off-by: Cedric Koch-Hofer <[email protected]>
@knard-intel knard-intel mentioned this pull request Sep 25, 2024
Merged
@knard-intel knard-intel marked this pull request as ready for review September 26, 2024 06:27
@knard-intel knard-intel requested a review from a team as a code owner September 26, 2024 06:27
@knard-intel
Copy link
Contributor Author

WARNING This PR should not be merged before the PR daos-stack/argobots#26 of the argobots-package one.

brianjmurrell
brianjmurrell requested changes Oct 7, 2024
View reviewed changes
Copy link
Contributor

@brianjmurrell brianjmurrell left a comment

Choose a reason for hiding this comment

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

You should also update

daos/debian/control

Line 19 in 861445b

libabt-dev,
similarly and add the necessary debian/changelog entry update.

utils/rpms/daos.spec Outdated
@@ -592,6 +592,9 @@ getent passwd daos_agent >/dev/null || useradd -s /sbin/nologin -r -g daos_agent
# No files in a shim package

%changelog
* Tue Sep 24 2024 Cedric Koch-Hofer <[email protected]> 2.7.100-6
- Update argobots to 1.2
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
- Update argobots to 1.2
- Update BR: argobots to 1.2

Copy link
Contributor Author

@knard-intel knard-intel Oct 7, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

  • Fix changelog message

utils/rpms/daos.spec Outdated
@@ -41,7 +41,7 @@ BuildRequires: hwloc-devel
BuildRequires: bullseye
%endif
%if (0%{?rhel} >= 8)
BuildRequires: argobots-devel >= 1.1
BuildRequires: argobots-devel >= 1.2
Copy link
Contributor

Choose a reason for hiding this comment

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

You also need to update

daos/utils/rpms/daos.spec

Line 48 in 861445b

BuildRequires: libabt-devel >= 1.0rc1

But probably a better way to handle this is to add a new

%global argobots_version 1.2

after

daos/utils/rpms/daos.spec

Line 7 in 861445b

%global libfabric_version 1.15.1-1
and then you can do this here:

Suggested change
BuildRequires: argobots-devel >= 1.2
BuildRequires: argobots-devel >= %{argobots_version}

and then

-BuildRequires: libabt-devel >= 1.0rc1
+BuildRequires: libabt-devel >= %{argobots_version}

on line 48.

Copy link
Contributor Author

@knard-intel knard-intel Oct 7, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

  • Improve RPM build dep version handling

utils/rpms/daos.spec Outdated
@@ -592,6 +592,9 @@ getent passwd daos_agent >/dev/null || useradd -s /sbin/nologin -r -g daos_agent
# No files in a shim package

%changelog
* Tue Sep 24 2024 Cedric Koch-Hofer <[email protected]> 2.7.100-6
Copy link
Contributor

Choose a reason for hiding this comment

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

Please freshen the datestamp here.

Copy link
Contributor Author

@knard-intel knard-intel Oct 7, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

  • Refresh changelong timestamp

@kanard38 @knard-intel
Merge remote-tracking branch 'origin/master' into ckochhof/dev/master…
bf6641a 
…/daos-15596

Required-githooks: true
@kanard38 @knard-intel
DAOS-15596 pkg: Update argobots to 1.2
138a284 
Fix reviewers comments:
- Fix changelog message
- Improve RPM build dep version handling
- Refresh changelong timestamp
- Update debian packaging info

PR-repos: argobots@PR-26:14
Required-githooks: true
Signed-off-by: Cedric Koch-Hofer <[email protected]>
@daosbuild1
Copy link
Collaborator

Test stage Build RPM on EL 8 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-15181/5/execution/node/344/log

@daosbuild1
Copy link
Collaborator

Test stage Build RPM on EL 9 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-15181/5/execution/node/357/log

@daosbuild1
Copy link
Collaborator

Test stage Build RPM on Leap 15.5 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-15181/5/execution/node/341/log

@daosbuild1
Copy link
Collaborator

Test stage Build DEB on Ubuntu 20.04 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-15181/5/execution/node/338/log

brianjmurrell
brianjmurrell requested changes Oct 9, 2024
View reviewed changes
utils/rpms/daos.spec Show resolved Hide resolved
@kanard38 @knard-intel
Merge remote-tracking branch 'origin/master' into ckochhof/dev/master…
32d4aea 
…/daos-15596
@kanard38 @knard-intel
DAOS-15596 pkg: Update argobots to 1.2
446561a 
Fix reviewers comments:
- Fix missing version update

Required-githooks: true
Signed-off-by: Cedric Koch-Hofer <[email protected]>
brianjmurrell
brianjmurrell previously approved these changes Oct 9, 2024
View reviewed changes
@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-15181/8/execution/node/1519/log

@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-15181/9/execution/node/476/log

@knard-intel
Copy link
Contributor Author

@brianjmurrell could you tell me, please, if the PR is OK for you of if something is missing.

@knard-intel knard-intel requested a review from a team October 15, 2024 12:05
@knard-intel
Copy link
Contributor Author

@daos-stack/daos-gatekeeper , please could you lend this PR with the following commit message:
Title: DAOS-15596 pkg: Update argobots to 1.2
Body:
Update argopbots dependency to 1.2 release

@daltonbohning daltonbohning merged commit e2d0df9 into master Oct 15, 2024
74 of 76 checks passed
@daltonbohning daltonbohning deleted the ckochhof/dev/master/daos-15596 branch October 15, 2024 15:56
@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

@grom72 grom72 grom72 approved these changes

@brianjmurrell brianjmurrell brianjmurrell approved these changes

@phender phender Awaiting requested review from phender

@liw liw Awaiting requested review from liw

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@knard-intel @daosbuild1 @brianjmurrell @grom72 @daltonbohning @kanard38