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-15859 build: Move master to 2.7 test builds. #14407

Merged
merged 3 commits into from
May 21, 2024
Merged

DAOS-15859 build: Move master to 2.7 test builds. #14407

merged 3 commits into from
May 21, 2024

Conversation

phender
Copy link
Contributor

@phender phender commented May 20, 2024

Moving master to 2.7 test builds. Bump version to 2.7.100.

Required-githooks: true

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.

@phender
DAOS-15859 build: Move master to 2.7 test builds.
92346ec 
Moving master to 2.7 test builds. Bump version to 2.7.100.

Required-githooks: true

Signed-off-by: Phil Henderson <[email protected]>
@phender phender requested review from a team as code owners May 20, 2024 16:46
daltonbohning
daltonbohning reviewed May 20, 2024
View reviewed changes
Copy link
Contributor

@daltonbohning daltonbohning left a comment

Choose a reason for hiding this comment

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

I think this needs updating
https://raw.githubusercontent.com/daos-stack/daos/master/docs/admin/administration.md
Under "Examples:"
2.4 -> 2.6
2.5 -> 2.7

The previous older references I'm not sure of. Maybe can handle this separately

@github-actions GitHub Actions
Copy link

Ticket title is 'Branch 2.6'
Status is 'In Progress'
https://daosio.atlassian.net/browse/DAOS-15859

@phender
Fix versions in doc files.
64b2000 
Required-githooks: true

Signed-off-by: Phil Henderson <[email protected]>
daltonbohning
daltonbohning reviewed May 20, 2024
View reviewed changes
docs/release/release_notes.md Outdated
@@ -1,6 +1,6 @@
# DAOS Version 2.6 Release Notes
# DAOS Version 2.7 Release Notes
Copy link
Contributor

Choose a reason for hiding this comment

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

2.8

docs/release/support_matrix.md Outdated
@@ -1,6 +1,6 @@
# DAOS Version 2.6 Support
# DAOS Version 2.7 Support
Copy link
Contributor

Choose a reason for hiding this comment

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

2.8

docs/release/upgrading.md Outdated
@@ -1,6 +1,6 @@
# Upgrading to DAOS Version 2.6
# Upgrading to DAOS Version 2.7
Copy link
Contributor

Choose a reason for hiding this comment

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

2.8

@phender phender requested a review from Michael-Hennecke May 20, 2024 17:25
@phender
Apply feedback.
c143180 
Required-githooks: true

Signed-off-by: Phil Henderson <[email protected]>
@phender phender requested a review from daltonbohning May 20, 2024 18:34
@phender
Copy link
Contributor Author

phender commented May 21, 2024

All tests passed in https://build.hpdd.intel.com/job/daos-stack/job/daos/job/PR-14407/3/testReport/

@phender phender merged commit ff4375a into master May 21, 2024
53 checks passed
@phender phender deleted the pahender/DAOS-15859 branch May 21, 2024 03:43
@brianjmurrell
Copy link
Contributor

FWIW, all of the doc updates that are required seem to be begging for some form of templating. The numbers of changes such as this is just going to continue to grow and be more troublesome for future updates such as this.

@daltonbohning
Copy link
Contributor

FWIW, all of the doc updates that are required seem to be begging for some form of templating. The numbers of changes such as this is just going to continue to grow and be more troublesome for future updates such as this.

markdown doesn't seem to have any built-in template/variables so we'd either need some plugin (if they exist) or some template + script to update.

We always forget one or more references on the first go :(

@brianjmurrell
Copy link
Contributor

markdown doesn't seem to have any built-in template/variables

No, it does not, sadly.

so we'd either need some plugin (if they exist) or some template + script to update.

Indeed. The latter is what I was thinking about. If our project were a GNU Autotools project for example, we could template any file we wanted by creating them as .in files with @…@ variables in them and one of the Autotools will replace the variables with values.

We could do much the same much simpler with sed, or even employ a more sophistacated templating engine like Jinja.

We always forget one or more references on the first go :(

Exactly!

@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

@mchaarawi mchaarawi mchaarawi approved these changes

@daltonbohning daltonbohning daltonbohning approved these changes

@brianjmurrell brianjmurrell Awaiting requested review from brianjmurrell

@jolivier23 jolivier23 Awaiting requested review from jolivier23

@Michael-Hennecke Michael-Hennecke Awaiting requested review from Michael-Hennecke

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@phender @brianjmurrell @daltonbohning @mchaarawi