Skip to content

Bphilip/refactor version entangle check add release number#12817

Closed
binujp wants to merge 69 commits into3.0-devfrom
bphilip/refactor-version-entangle-check-add-minor-1
Closed

Bphilip/refactor version entangle check add release number#12817
binujp wants to merge 69 commits into3.0-devfrom
bphilip/refactor-version-entangle-check-add-minor-1

Conversation

@binujp
Copy link
Copy Markdown
Contributor

@binujp binujp commented Mar 4, 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?
MOFED and associated kernel modules did not include kernel minor version in the entangle check. check_entangle script did not provide enough details when it failed. Zeroing in on the exact mis-match needed additional effort. Added a unit test to make sure the script was indeed doing everything as expected.

There was some refactoring done to the script to make the workflow more compact.

Change Log
  • Change
  • Change
  • Change
Does this affect the toolchain?

YES/NO

NO

Associated issues
  • #xxxx
Links to CVEs
Test Methodology
  • Pipeline build id: xxxx

@binujp binujp requested a review from a team as a code owner March 4, 2025 23:47
@microsoft-github-policy-service microsoft-github-policy-service Bot added Packaging Tools 3.0-dev PRs Destined for AzureLinux 3.0 labels Mar 4, 2025
@binujp binujp force-pushed the bphilip/refactor-version-entangle-check-add-minor-1 branch from 770903c to 892aab0 Compare March 5, 2025 01:22
@binujp binujp force-pushed the bphilip/refactor-version-entangle-check-add-minor-1 branch from 892aab0 to 26bff49 Compare March 5, 2025 01:27
Comment on lines +158 to +159
if verbose:
print(f"Processing group: {group}")
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggestion: instead of repeating if verbose: what do you think about creating a wrapper print_verbose function?

PawelWMS
PawelWMS previously approved these changes Mar 6, 2025
Copy link
Copy Markdown
Contributor

@PawelWMS PawelWMS left a comment

Choose a reason for hiding this comment

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

One small suggestion but looks good to me.

(['sdkver'], sdkver_matching_groups, {}),
(['epoch', 'version', 'release'], version_release_matching_groups, {}),
(['epoch', 'version'], version_matching_groups, {}),
(['last-known-kernel'], oot_kmodule_matching_groups,
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Now that I look at this again, can't I just pass only { tag: value } instead of a tag array and a tag: value dict? Hmm..

CBL-Mariner-Bot and others added 17 commits March 12, 2025 00:13
…12819)

Co-authored-by: corvus-callidus <108946721+corvus-callidus@users.noreply.github.com>
Adding slang-devel to kernel spec, enabling perf tui

Perf's Makefile has a slang-devel check, which enables tui when slang is detected. (https://github.com/microsoft/CBL-Mariner-Linux-Kernel/blob/rolling-lts/mariner-3/6.6.78.1/tools/perf/Makefile.config#L765). Adding this package at built time will allow
perf --tui support

Co-authored-by: Andy Zaugg <azaugg@linkedin.com>
AkarshHCL and others added 23 commits March 12, 2025 00:16
…High] & CVE-2024-28180 CVE-2025-27144 [Medium] - branch 3.0-dev (#12875)

Co-authored-by: Kanishk Bansal <103916909+Kanishk-Bansal@users.noreply.github.com>
Signed-off-by: Chris Co <chrco@microsoft.com>
License file got desynced due to 0de902e
This change restores the LICENSES-MAP.md file.

Signed-off-by: Chris Co <chrco@microsoft.com>
Starting in kernel v6.6.76, our automated testing encountered failures
on specific bare-metal systems where, after a kernel panic, sometimes
the kernel's panic message was not seen in the system's IPMI SEL.

After bisecting the changes between v6.6.75 to v6.6.76, we isolated the
offending commit to:

     serial: 8250: Adjust the timeout for FIFO mode

To restore functionality, revert the offending commit. We will continue
investigating the issue separately.

Apply to both kernel and kernel-64k.

Signed-off-by: Chris Co <chrco@microsoft.com>
Include new subpackages to access the official azure linux cloud-native
package repository and preview package repository on
packages.microsoft.com.

Signed-off-by: Chris Co <chrco@microsoft.com>
@binujp binujp requested a review from a team as a code owner March 12, 2025 00:16
@microsoft-github-policy-service microsoft-github-policy-service Bot added the specs-extended PR to fix SPECS-EXTENDED label Mar 12, 2025
@binujp binujp changed the base branch from 3.0-dev to 3.0 March 12, 2025 00:47
@binujp binujp changed the base branch from 3.0 to 3.0-dev March 12, 2025 00:47
@binujp binujp dismissed PawelWMS’s stale review March 12, 2025 00:47

The base branch was changed.

@binujp
Copy link
Copy Markdown
Contributor Author

binujp commented Mar 12, 2025

Superseded by #12910

@binujp binujp closed this Mar 12, 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 Packaging specs-extended PR to fix SPECS-EXTENDED Tools

Projects

None yet

Development

Successfully merging this pull request may close these issues.