Skip to content

Conversation

austinvazquez
Copy link
Member

@austinvazquez austinvazquez commented Jul 3, 2025

Related to #12007

This change removes the additional fuzzers from AdamKorcz/instrumentation repository. This is to unblock changes in containerd release/1.7 stable branch where the fuzzing workflow is failing due to compilation issues caused by higher Go toolchain requirement in mainline.

@austinvazquez
Copy link
Member Author

cc: @AdamKorcz

@austinvazquez austinvazquez force-pushed the checkout-adamkorcz-instrumentation-for-fuzzing branch from f5fff79 to ab65c4a Compare July 3, 2025 20:26
@AdamKorcz
Copy link
Contributor

@austinvazquez I am not sure that this will fix the CI issue. Now you are just cloning in the build script instead of the Dockerfile, but that is not the problem. The problem comes when building and running the instrumentation library.

@austinvazquez
Copy link
Member Author

austinvazquez commented Jul 3, 2025

I am thinking in release/1.7 branch we can pin the instrumentation repo to a commit that worked previously. This way the project can pick what makes sense based on its requirements instead of having a floating dependency in upstream tooling.

Okay it hit me, we cannot simply have each branch specify the dependency version because currently upstream oss-fuzz is floating on containerd main. So the oss_fuzz_build.sh script in the stable branches are not being used.

This change removes the additional AdamKorcz/instrumentation fuzzers
from CI until the oss-fuzz can implement a mechanism to specify the
project branch as an argument through its GitHub Actions package.

Signed-off-by: Austin Vazquez <[email protected]>
@austinvazquez austinvazquez force-pushed the checkout-adamkorcz-instrumentation-for-fuzzing branch from ab65c4a to aed961a Compare July 3, 2025 21:06
@austinvazquez austinvazquez changed the title Pull instrumentation fuzzers if not found Remove additional fuzzers from instrumentation repo Jul 3, 2025
@austinvazquez
Copy link
Member Author

Okay removed the code that runs the additional fuzzers. Will try to work with upstream oss_fuzz project if we can add an argument to specify the project (containerd) branch as an argument to the container image.

@github-project-automation github-project-automation bot moved this from Needs Triage to Review In Progress in Pull Request Review Jul 7, 2025
@estesp estesp added this pull request to the merge queue Jul 7, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jul 7, 2025
@AkihiroSuda AkihiroSuda added this pull request to the merge queue Jul 15, 2025
@AkihiroSuda AkihiroSuda added the cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch label Jul 15, 2025
@AkihiroSuda
Copy link
Member

/cherry-pick release/1.7

@k8s-infra-cherrypick-robot

@AkihiroSuda: once the present PR merges, I will cherry-pick it on top of release/1.7 in a new PR and assign it to you.

In response to this:

/cherry-pick release/1.7

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Merged via the queue into containerd:main with commit 22b1db9 Jul 15, 2025
89 of 91 checks passed
@github-project-automation github-project-automation bot moved this from Review In Progress to Done in Pull Request Review Jul 15, 2025
@k8s-infra-cherrypick-robot

@AkihiroSuda: new pull request created: #12099

In response to this:

/cherry-pick release/1.7

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@austinvazquez austinvazquez deleted the checkout-adamkorcz-instrumentation-for-fuzzing branch July 16, 2025 03:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch size/XS
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

6 participants