-
Notifications
You must be signed in to change notification settings - Fork 2.2k
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.
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
Add cloudbuild for building chronos images for all C++. #12549
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
e390a00
Add cloudbuild for building chronos images for all C++.
oliverchang 33a3777
Add missing headers
oliverchang 7e508b1
fixes
oliverchang 5c22bd3
more fixes
oliverchang d865c6d
async
oliverchang 381102a
logs bucket
oliverchang 6fd9faf
fix license
oliverchang File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
# Copyright 2024 Google LLC | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
# | ||
################################################################################ | ||
FROM gcr.io/cloud-builders/gcloud | ||
|
||
RUN apt-get update && apt-get install -y jq |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
#!/bin/bash | ||
# Copyright 2024 Google LLC | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
# | ||
################################################################################ | ||
|
||
# Build all C/C++ projects. | ||
c_project_yaml=$(find projects/ -name project.yaml -exec grep -l 'language: c' {} \;) | ||
projs=$(echo $c_project_yaml | xargs dirname | xargs basename -a | sort) | ||
|
||
cd infra/experimental/chronos | ||
|
||
for proj in $projs; do | ||
fuzz_target=$(curl -s "https://introspector.oss-fuzz.com/api/harness-source-and-executable?project=$proj" | jq --raw-output '.pairs[0].executable') | ||
if [ "$fuzz_target" != null ]; then | ||
echo ./build_on_cloudbuild.sh $proj $fuzz_target c | ||
./build_on_cloudbuild.sh $proj $fuzz_target c | ||
fi | ||
done |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -61,5 +61,9 @@ images: | |
- us-central1-docker.pkg.dev/oss-fuzz/oss-fuzz-gen/${_PROJECT}-ofg-cached-cov | ||
timeout: 1800s | ||
serviceAccount: 'projects/oss-fuzz/serviceAccounts/[email protected]' | ||
logsBucket: oss-fuzz-gcb-logs | ||
options: | ||
logging: CLOUD_LOGGING_ONLY | ||
logging: GCS_ONLY | ||
tags: | ||
- ${_PROJECT} | ||
- chronos |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
# Copyright 2024 Google LLC | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
# | ||
################################################################################ | ||
# CloudBuild for generating Chronos-cached images. | ||
steps: | ||
- name: 'gcr.io/cloud-builders/docker' | ||
args: | ||
- build | ||
- -t | ||
- gcloud | ||
- . | ||
dir: infra/experimental/chronos | ||
- name: 'gcloud' | ||
args: | ||
- infra/experimental/chronos/build_all.sh | ||
entrypoint: /bin/bash | ||
timeout: 1800s | ||
serviceAccount: 'projects/oss-fuzz/serviceAccounts/[email protected]' | ||
options: | ||
logging: CLOUD_LOGGING_ONLY | ||
tags: | ||
- chronos-all |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
always
c
language? The abovegrep
will capture bothc
andc++
, and I assume we want to pick one here?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does the language itself actually matter? @DonggeLiu
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(the intent was indeed to capture both c and c++)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The language (
c
vsc++
) does not matter here, becausechronos
only checks if fuzz target file name is mentioned in the command.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry, I was wrong here.
We do want to capture both
c
andc++
, but the language here also sets theFUZZING_LANGUAGE
environment variable when building the fuzz target. I reckon this matters when the project uses different FLAGS (CFLAGS
orCXXFLAGS
)?For projects like
ada-url
(which isc++
) this works fine, but some other projects might be affected.Also the fuzz target binary and source file might be different from the ones in OFG benchmark (e.g.,
url_search_params
vsparse
in projectada-url
). I will modify OFG to be consistent with this and collect the names of projects that do not work.