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 #12243

Closed
wants to merge 126 commits into from

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

nicogbg and others added 30 commits February 26, 2024 16:56
merge 3.0-dev into 3.0
Signed-off-by: Muhammad Falak R Wani <[email protected]>
Co-authored-by: Paco Huelsz <[email protected]>
Co-authored-by: Andrew Phelps <[email protected]>
Co-authored-by: alejandro-microsoft <[email protected]>
Co-authored-by: CBL-Mariner Servicing Account <[email protected]>
Co-authored-by: SeanDougherty <[email protected]>
Co-authored-by: Henry Beberman <[email protected]>
Co-authored-by: Henry Li <[email protected]>
Co-authored-by: Henry Li <[email protected]>
Co-authored-by: Bala <[email protected]>
Co-authored-by: Muhammad Falak R Wani <[email protected]>
Co-authored-by: suresh-thelkar <[email protected]>
Co-authored-by: Dan Streetman <[email protected]>
Co-authored-by: Mandeep Plaha <[email protected]>
Co-authored-by: jslobodzian <[email protected]>
Co-authored-by: George Mileka <[email protected]>
Co-authored-by: CBL-Mariner-Bot <[email protected]>
Co-authored-by: lanzeliu <[email protected]>
Co-authored-by: Karim Eldegwy <[email protected]>
Co-authored-by: osamaesmailmsft <[email protected]>
Co-authored-by: Tobias Brick <[email protected]>
Co-authored-by: abadawi-msft <[email protected]>
Co-authored-by: Mykhailo Bykhovtsev <[email protected]>
Co-authored-by: sindhu-karri <[email protected]>
Co-authored-by: Rohit Rawat <[email protected]>
Co-authored-by: Dan Streetman <[email protected]>
Co-authored-by: Nan Liu <[email protected]>
Co-authored-by: Neha Agarwal <[email protected]>
Co-authored-by: Adit Jha <[email protected]>
Co-authored-by: Nan Liu <[email protected]>
Co-authored-by: ypanch <[email protected]>
Co-authored-by: Trung <[email protected]>
Co-authored-by: Rakshaa Viswanathan <[email protected]>
Co-authored-by: Rakshaa Viswanathan <[email protected]>
Co-authored-by: Daniel McIlvaney <[email protected]>
Co-authored-by: Chris Gunn <[email protected]>
Co-authored-by: Cameron E Baird <[email protected]>
Co-authored-by: Pawel Winogrodzki <[email protected]>
Co-authored-by: Adub17030MS <[email protected]>
Co-authored-by: Sam Meluch <[email protected]>
Co-authored-by: Sam Meluch <[email protected]>
Co-authored-by: himaja-kesari <[email protected]>
Co-authored-by: Aurélien Bombo <[email protected]>
Co-authored-by: Lanze Liu <[email protected]>
Co-authored-by: ms-mahuber <[email protected]>
Co-authored-by: Kanika Nema <[email protected]>
A recent rebranding change #8238 changed the repo name used by the containerized-rpmbuild container for mariner to azl-3.0-daily-build, but didn't change the default tdnf argument, which continued to use mariner-3.0-daily-build. This results in tdnf not working in the container.

This fix updates the tdnf argument, basing it on the string in the repo file, so we don't have to copy/paste it later.
…ET option to suppress it (#8408)

The containerized-rpmbuild scripts suppress most output from our tools/make commands, which means you have no idea what it's doing, whether it's hung, or sometimes even what caused an error.

This change switches the default to print all this output to stdout, which a new option, QUIET to suppress it.
Co-authored-by: Sam Meluch <[email protected]>
Co-authored-by: Sam Meluch <[email protected]>
cwize1 and others added 26 commits October 31, 2024 12:04
Update kernel-64k to include kexec_sig verification. Bump all other relevant kernel specs
@anphel31 anphel31 requested a review from a team as a code owner February 6, 2025 00:08
@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
Copy link
Member Author

anphel31 commented Feb 6, 2025

created from wrong branch; closing

@anphel31 anphel31 closed this Feb 6, 2025
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.