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

BuildNvidiaDriverContainers.sh: fix processing of cuda RPM version #12244

Merged
merged 1 commit into from
Feb 6, 2025

Conversation

anphel31
Copy link
Member

@anphel31 anphel31 commented Feb 6, 2025

Merge Checklist

All boxes should be checked before merging the PR (just tick any boxes which don't apply to this PR)

  • The toolchain has been rebuilt successfully (or no changes were made to it)
  • The toolchain/worker package manifests are up-to-date
  • Any updated packages successfully build (or no packages were changed)
  • Packages depending on static components modified in this PR (Golang, *-static subpackages, etc.) have had their Release tag incremented.
  • Package tests (%check section) have been verified with RUN_CHECK=y for existing SPEC files, or added to new SPEC files
  • All package sources are available
  • cgmanifest files are up-to-date and sorted (./cgmanifest.json, ./toolkit/scripts/toolchain/cgmanifest.json, .github/workflows/cgmanifest.json)
  • LICENSE-MAP files are up-to-date (./LICENSES-AND-NOTICES/SPECS/data/licenses.json, ./LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md, ./LICENSES-AND-NOTICES/SPECS/LICENSE-EXCEPTIONS.PHOTON)
  • All source files have up-to-date hashes in the *.signatures.json files
  • sudo make go-tidy-all and sudo make go-test-coverage pass
  • Documentation has been updated to match any changes to the build system
  • Ready to merge

Summary

What does the PR accomplish, why was it needed?
BuildNvidiaDriverContainers.sh generates a string COMPONENT_VERSION to pass to generate-container-sbom.sh when generating an SBOM. COMPONENT_VERSION typically looks like this 550.54.15-3_6.6.57.1.7, but recently a new package "cuda-open" was added, causing this variable to contain both version numbers separated by a newline:

Component Version             -> 560.35.03-1_6.6.64.2.7
560.35.03-1_6.6.64.2.7

This causes an incorrect parameter to be passed to the SBOM script.

Change Log
  • Change handling of COMPONENT_VERSION in BuildNvidiaDriverContainers.sh
Does this affect the toolchain?

NO

Associated issues
Test Methodology

@anphel31 anphel31 requested a review from a team as a code owner February 6, 2025 00:12
@anphel31 anphel31 changed the title fix search path for cuda rpm BuildNvidiaDriverContainers.sh: fix processing of cuda RPM version Feb 6, 2025
@microsoft-github-policy-service microsoft-github-policy-service bot added the 3.0-dev PRs Destined for AzureLinux 3.0 label Feb 6, 2025
@anphel31 anphel31 merged commit 7df0cd2 into 3.0-dev Feb 6, 2025
13 checks passed
@anphel31 anphel31 deleted the anphel/3-fix-sbom-cuda-container-version2 branch February 6, 2025 01:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3.0-dev PRs Destined for AzureLinux 3.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants