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-16621 build: Fix Go versions in rpm/deb packaging (#15174) #15255

Merged
merged 8 commits into from
Dec 14, 2024

Conversation

kjacque
Copy link
Contributor

@kjacque kjacque commented Oct 4, 2024

  • Set Go minimum version to 1.21 in rpm and debian packaging spec files.
  • Update scons Go version check to use version in go.mod.
  • Add a reminder in go.mod file so we remember the packaging files when bumping the minimum Go version in the future.
  • Update Ubuntu 22.04 Dockerfile to get an appropriate version of Go.

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.

- Set Go minimum version to 1.21 in rpm and debian packaging spec files.
- Update scons Go version check to use version in go.mod.
- Add a reminder in go.mod file so we remember the packaging files when
  bumping the minimum Go version in the future.
- Update Ubuntu 22.04 Dockerfile to get an appropriate version of Go.

Required-githooks: true

Signed-off-by: Kris Jacque <[email protected]>
@kjacque kjacque added unclean-cherry-pick Indicates that a cherry-pick had merge conflicts that needed resolving. release-2.6.2 Targeted for release 2.6.2 labels Oct 4, 2024
@kjacque kjacque self-assigned this Oct 4, 2024
@kjacque kjacque requested review from a team as code owners October 4, 2024 21:38
@kjacque
Copy link
Contributor Author

kjacque commented Oct 4, 2024

No need for Features tags, as this affects only builds.

Both conflicts in the cherry-pick were in the changelog section of the RPM specfile and the Debian changelog.

@kjacque kjacque requested a review from ashleypittman October 4, 2024 21:40
Copy link

github-actions bot commented Oct 4, 2024

Ticket title is 'Fix Go version checks in scons and packaging specfiles'
Status is 'Awaiting backport'
Labels: 'scrubbed_2.8'
Job should run at elevated priority (1)
https://daosio.atlassian.net/browse/DAOS-16621

@github-actions github-actions bot added the priority Ticket has high priority (automatically managed) label Oct 4, 2024
@@ -81,7 +81,7 @@ BuildRequires: libyaml-devel
BuildRequires: libcmocka-devel
BuildRequires: valgrind-devel
BuildRequires: systemd
BuildRequires: go >= 1.17
BuildRequires: go >= 1.21
Copy link
Contributor

Choose a reason for hiding this comment

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

A bit late now I suppose since the master PR for this has already landed, but you could add a new %global go_version 1.21 after

%global libfabric_version 1.15.1-1
and then this would be:

Suggested change
BuildRequires: go >= 1.21
BuildRequires: go >= %{go_version}

and the same for

Requires: go >= 1.21
below so that you only have one place to have to update this.

Maybe next time.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for the tip, Brian. Yeah, we should probably make that fix at the master level first.

@kjacque
Copy link
Contributor Author

kjacque commented Oct 9, 2024

NLT failures appear to be unrelated to this PR. I've added the Allow-unstable pragma to allow us to bypass the failures.

@kjacque
Copy link
Contributor Author

kjacque commented Oct 15, 2024

Dug deeper into the NLT instability and created a ticket: https://daosio.atlassian.net/browse/DAOS-16716

This affects any 2.6 PR, not just this one.

@kjacque kjacque requested review from a team October 15, 2024 21:34
mjmac
mjmac previously approved these changes Oct 15, 2024
tanabarr
tanabarr previously approved these changes Oct 18, 2024
mjmac
mjmac previously approved these changes Oct 18, 2024
@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-15255/7/execution/node/1430/log

@kjacque kjacque requested a review from a team October 30, 2024 19:28
@daltonbohning
Copy link
Contributor

FYI release/2.6 currently closed until we cut a test build for Aurora acceptance

@daltonbohning daltonbohning added release-2.6.3 Targeted for 2.6.3 and removed release-2.6.2 Targeted for release 2.6.2 labels Dec 10, 2024
@daltonbohning
Copy link
Contributor

@kjacque There are conflicts again. And FYI 2.6 is open now

@daltonbohning daltonbohning removed request for a team and ashleypittman December 11, 2024 18:45
@kjacque kjacque dismissed stale reviews from mjmac and tanabarr via b0cff36 December 11, 2024 21:01
@kjacque kjacque requested review from mjmac and tanabarr December 11, 2024 21:01
Required-githooks: true

Signed-off-by: Kris Jacque <[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-15255/9/execution/node/352/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-15255/9/execution/node/357/log

@daltonbohning
Copy link
Contributor

Ubuntu-related build failures also need #15563 and #15607, which in turn rely on this PR. I think let's ignore the Ubuntu failures on this PR, assuming they are not directly related. Then #15563 and #15607 should fix them.

@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-15255/11/testReport/

@daltonbohning daltonbohning requested a review from a team December 14, 2024 14:37
@daltonbohning daltonbohning added the forced-landing The PR has known failures or has intentionally reduced testing, but should still be landed. label Dec 14, 2024
@daltonbohning daltonbohning merged commit c631702 into release/2.6 Dec 14, 2024
61 of 67 checks passed
@daltonbohning daltonbohning deleted the kjacque/2.6/go-build-version-checks branch December 14, 2024 14:38
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. priority Ticket has high priority (automatically managed) release-2.6.3 Targeted for 2.6.3 unclean-cherry-pick Indicates that a cherry-pick had merge conflicts that needed resolving.
Development

Successfully merging this pull request may close these issues.

6 participants