Skip to content

fix: go-license dependency and fixes for provenance/sbom tests. #4318

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
Merged
merged 2 commits into from
Jun 18, 2025
Merged

fix: go-license dependency and fixes for provenance/sbom tests. #4318

merged 2 commits into from
Jun 18, 2025

Conversation

Shubhranshu153
Copy link
Contributor

Testing if this fixes go-license issue.

@Shubhranshu153 Shubhranshu153 force-pushed the update-go-license branch 4 times, most recently from a4dc8c9 to 690b54d Compare June 13, 2025 21:10
@Shubhranshu153 Shubhranshu153 force-pushed the update-go-license branch 7 times, most recently from a2ba060 to 33fc1d3 Compare June 13, 2025 23:11
@Shubhranshu153 Shubhranshu153 mentioned this pull request Jun 13, 2025
Closed
@Shubhranshu153 Shubhranshu153 force-pushed the update-go-license branch 5 times, most recently from a8f0c38 to 5cecd6a Compare June 13, 2025 23:57
@Shubhranshu153
Copy link
Contributor Author

I have opened this PR: google/go-licenses#330 to update go-licenses package.

apostasie
apostasie reviewed Jun 14, 2025
View reviewed changes
@Shubhranshu153 Shubhranshu153 force-pushed the update-go-license branch 2 times, most recently from e90a40e to 408f745 Compare June 14, 2025 02:28
@Shubhranshu153 Shubhranshu153 changed the title [DO NOT MERGE] fix: go-license dependency fix: go-license dependency Jun 14, 2025
@Shubhranshu153 Shubhranshu153 force-pushed the update-go-license branch 2 times, most recently from 0bf1c36 to 4ff81d9 Compare June 16, 2025 17:59
@apostasie apostasie mentioned this pull request Jun 16, 2025
Merged
@Shubhranshu153
Copy link
Contributor Author

Flaky Tests:

  1. TestBuildAttestation/Provenance
  2. TestNetworkInspect
  3. Test in almalinux?

@Shubhranshu153
Copy link
Contributor Author

Shubhranshu153 commented Jun 16, 2025 •
edited
Loading

@apostasie for networking i think there is some level of path concurrency or regex check for nat is happening. seems flaky so likely concurrency. what do you think?

@apostasie
Copy link
Contributor

@apostasie for networking i think there is some level of path concurrency or regex check for nat is happening. seems flaky so likely concurrency. what do you think?

If something is flaky, we should list it in there: #4120
(there is a clearly a few related to networking, and generally Alma is a PITA)

BuiltAttestation is a bit more worrisome.

@Shubhranshu153
Copy link
Contributor Author

Shubhranshu153 commented Jun 17, 2025 •
edited
Loading

For provenance and sbom they started adding platform info so needed a regex. its not flaky.

@Shubhranshu153 Shubhranshu153 changed the title fix: go-license dependency fix: go-license dependency and fixes for provenance/sbom tests. Jun 17, 2025
@haytok haytok mentioned this pull request Jun 17, 2025
Merged
@Shubhranshu153
Copy link
Contributor Author

@AkihiroSuda can i get an approval for this.
Still a bit flaky. Will record it in #4120

@Shubhranshu153 Shubhranshu153 mentioned this pull request Jun 17, 2025
Merged
@apostasie
Copy link
Contributor

@Shubhranshu153 thanks for taking care of this.

Maybe, ideally, we would have two separate commits? (one for go 1.24 compat, and the other one for build attestation change?)

Otherwise LGTM.

@Shubhranshu153
fix:go-license dependency
9df1527 
Signed-off-by: shubhranshu153 <[email protected]>
@Shubhranshu153
fix: sbom and provenance tests
0eee948 
Signed-off-by: shubhranshu153 <[email protected]>
@Shubhranshu153
Copy link
Contributor Author

Split the commits.

@AkihiroSuda AkihiroSuda added this to the v2.1.3 milestone Jun 18, 2025
AkihiroSuda
AkihiroSuda approved these changes Jun 18, 2025
View reviewed changes
Copy link
Member

@AkihiroSuda AkihiroSuda left a comment

Choose a reason for hiding this comment

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

Thanks

@AkihiroSuda AkihiroSuda merged commit 81c6a30 into containerd:main Jun 18, 2025
62 of 63 checks passed
@yashuatla yashuatla mentioned this pull request Jun 25, 2025
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

+1 more reviewer

@apostasie apostasie apostasie approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
area/ci e.g., CI failure priority/high
Projects
None yet
Milestone
v2.1.3
Development

Successfully merging this pull request may close these issues.
3 participants
@Shubhranshu153 @apostasie @AkihiroSuda