Skip to content

Commit

Permalink
Revert "cop: Disable oss-fuzz coverage builds"
Browse files Browse the repository at this point in the history
This reverts commit 9f1d74f.

Reason for revert: Green again https://crbug.com/oss-fuzz/64742#c1

Original change's description:
> cop: Disable oss-fuzz coverage builds
>
> BUG=b:314697420
> TEST=cop
> TEST=devtools/copgen.sh
>
> Change-Id: I8ecf63e9f93fe664479aff5f7377665eac0cf5e3
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/adhd/+/5082326
> Tested-by: chromeos-cop-builder@chromeos-cop.iam.gserviceaccount.com <chromeos-cop-builder@chromeos-cop.iam.gserviceaccount.com>
> Tested-by: Li-Yu Yu <aaronyu@google.com>
> Reviewed-by: Chih-Yang Hsia <paulhsia@chromium.org>
> Commit-Queue: Li-Yu Yu <aaronyu@google.com>

BUG=b:314697420

Change-Id: I8132b4e4bae65dadba8c70f8e17c1498a729b92f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/adhd/+/5107819
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Tested-by: chromeos-cop-builder@chromeos-cop.iam.gserviceaccount.com <chromeos-cop-builder@chromeos-cop.iam.gserviceaccount.com>
Commit-Queue: Li-Yu Yu <aaronyu@google.com>
  • Loading branch information
afq984 authored and Chromeos LUCI committed Dec 10, 2023
1 parent 57470a1 commit 1be3569
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 2 deletions.
47 changes: 47 additions & 0 deletions .cop/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -670,6 +670,53 @@
"oss-fuzz-undefined:1"
],
"entrypoint": "python3"
},
{
"name": "gcr.io/${PROJECT_ID}/adhd-archlinux-builder",
"args": [
"-ah",
"oss-fuzz-setup/",
"oss-fuzz-coverage/"
],
"id": "oss-fuzz-coverage:0",
"waitFor": [
"oss-fuzz-setup:3"
],
"entrypoint": "rsync"
},
{
"name": "gcr.io/cloud-builders/docker",
"args": [
"oss-fuzz/infra/helper.py",
"build_fuzzers",
"--sanitizer",
"coverage",
"--engine",
"libfuzzer",
"cras",
"/workspace/oss-fuzz-coverage/adhd"
],
"dir": "oss-fuzz-coverage",
"id": "oss-fuzz-coverage:1",
"waitFor": [
"oss-fuzz-coverage:0"
],
"entrypoint": "python3"
},
{
"name": "gcr.io/google.com/cloudsdktool/cloud-sdk",
"args": [
"oss-fuzz/infra/helper.py",
"coverage",
"cras",
"--port="
],
"dir": "oss-fuzz-coverage",
"id": "oss-fuzz-coverage:2",
"waitFor": [
"oss-fuzz-coverage:1"
],
"entrypoint": "python3"
}
],
"timeout": "1200s",
Expand Down
3 changes: 1 addition & 2 deletions devtools/quick-verifier/build/build_steps.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ func makeBuild(gitSteps *buildplan.Sequence, tags []string) *cloudbuildpb.Build
b.Add(ossFuzzSteps("oss-fuzz-address-afl", "address", "afl").WithDep(ossFuzzSetup))
b.Add(ossFuzzSteps("oss-fuzz-memory", "memory", "libfuzzer").WithDep(ossFuzzSetup))
b.Add(ossFuzzSteps("oss-fuzz-undefined", "undefined", "libfuzzer").WithDep(ossFuzzSetup))
// TODO(b/314697420): Re-enable when fixed.
// b.Add(ossFuzzSteps("oss-fuzz-coverage", "coverage", "libfuzzer").WithDep(ossFuzzSetup))
b.Add(ossFuzzSteps("oss-fuzz-coverage", "coverage", "libfuzzer").WithDep(ossFuzzSetup))

return &cloudbuildpb.Build{
Steps: b.AsCloudBuild(),
Expand Down

0 comments on commit 1be3569

Please sign in to comment.