From 1be356970dcfdf536e0f2f906bfb122f69592159 Mon Sep 17 00:00:00 2001 From: Li-Yu Yu Date: Sun, 10 Dec 2023 22:40:25 +0000 Subject: [PATCH] Revert "cop: Disable oss-fuzz coverage builds" This reverts commit 9f1d74f55b73bca9d77b1d668bd9460a35c79a0d. 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 > Tested-by: Li-Yu Yu > Reviewed-by: Chih-Yang Hsia > Commit-Queue: Li-Yu Yu BUG=b:314697420 Change-Id: I8132b4e4bae65dadba8c70f8e17c1498a729b92f Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/adhd/+/5107819 Bot-Commit: Rubber Stamper Tested-by: chromeos-cop-builder@chromeos-cop.iam.gserviceaccount.com Commit-Queue: Li-Yu Yu --- .cop/build.yaml | 47 ++++++++++++++++++++ devtools/quick-verifier/build/build_steps.go | 3 +- 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/.cop/build.yaml b/.cop/build.yaml index c95604dc9..df0bce109 100644 --- a/.cop/build.yaml +++ b/.cop/build.yaml @@ -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", diff --git a/devtools/quick-verifier/build/build_steps.go b/devtools/quick-verifier/build/build_steps.go index 711042d25..0d029a011 100644 --- a/devtools/quick-verifier/build/build_steps.go +++ b/devtools/quick-verifier/build/build_steps.go @@ -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(),