Skip to content

fix for OSS-Fuzz infra changes#7677

Merged
kzys merged 1 commit intocontainerd:mainfrom
AdamKorcz:fuzz2
Nov 22, 2022
Merged

fix for OSS-Fuzz infra changes#7677
kzys merged 1 commit intocontainerd:mainfrom
AdamKorcz:fuzz2

Conversation

@AdamKorcz
Copy link
Copy Markdown
Contributor

@AdamKorcz AdamKorcz commented Nov 16, 2022

Changes will be rolled out on OSS-Fuzz that will break the Containerd build. This PR prepares the necessary fixes for it.

Signed-off-by: AdamKorcz [email protected]

@k8s-ci-robot
Copy link
Copy Markdown

k8s-ci-robot commented Nov 16, 2022

Hi @AdamKorcz. Thanks for your PR.

I'm waiting for a containerd member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

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/test-infra repository.

@AdamKorcz AdamKorcz mentioned this pull request Nov 16, 2022
Merged
@AdamKorcz AdamKorcz marked this pull request as ready for review November 21, 2022 17:59
@AdamKorcz AdamKorcz marked this pull request as draft November 21, 2022 18:00
@AdamKorcz AdamKorcz force-pushed the fuzz2 branch 2 times, most recently from a745c46 to 74f4dbc Compare November 21, 2022 19:31
@AdamKorcz
Copy link
Copy Markdown
Contributor Author

AdamKorcz commented Nov 21, 2022

This is fixed when I locally and manually rebuild the updated the base images - which have been changed. I think we just need to wait for the image repo to be updated for CIFuzz to get the updates too.

@AdamKorcz AdamKorcz force-pushed the fuzz2 branch 6 times, most recently from 1f8782f to db0ece5 Compare November 21, 2022 20:32
@AdamKorcz AdamKorcz marked this pull request as ready for review November 22, 2022 11:21
@AdamKorcz
Copy link
Copy Markdown
Contributor Author

AdamKorcz commented Nov 22, 2022

@kzys this fixes the OSS-Fuzz build that broke today.

estesp
estesp approved these changes Nov 22, 2022
View reviewed changes
Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

kzys
kzys reviewed Nov 22, 2022
View reviewed changes
Comment thread contrib/fuzz/oss_fuzz_build.sh
done
}


Copy link
Copy Markdown
Member

@kzys kzys Nov 22, 2022

Choose a reason for hiding this comment

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

Not a blocker, but it is better to not have changes like that

@kzys kzys merged commit 722df11 into containerd:main Nov 22, 2022
@kzys
Copy link
Copy Markdown
Member

kzys commented Nov 22, 2022

Sorry. Clicked Merge before Approve...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kzys kzys kzys left review comments

@estesp estesp estesp approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@AdamKorcz @k8s-ci-robot @kzys @estesp