Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Use private pool cloud build worker #316

Merged
merged 3 commits into from
Mar 14, 2024
Merged

Use private pool cloud build worker #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
68729e3
use 16core private worker
jbohanon Mar 14, 2024
9dd6c57
mimic build-bot's repo tag
jbohanon Mar 14, 2024
d8aa9fd
sub-job tag
jbohanon Mar 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion ci/cloudbuild.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,23 @@ steps:
- 'TAGGED_VERSION=$TAG_NAME'

options:
machineType: 'N1_HIGHCPU_32'
pool:
name: 'projects/solo-public/locations/us-central1/workerPools/envoy-gloo-runner'
timeout: 20000s

artifacts:
objects:
location: 'gs://solo-public-artifacts.solo.io/envoy/$COMMIT_SHA/'
paths: ['linux/amd64/build_envoy_release/envoy']

tags:
- "repo_envoy-gloo"
ben-taussig-solo marked this conversation as resolved.
Show resolved Hide resolved
# This tag can be used to filter for or out jobs which are spawned by the main job
# submitted by build-bot. It's somewhat redundant as one could filter on `tags~^pr`
# to achieve the same effect since that tag is added to main jobs by build-bot,
# but this is somewhat less esoteric
- "sub-job"

availableSecrets:
inline:
- kmsKeyName: projects/solo-public/locations/global/keyRings/build/cryptoKeys/build-key
Expand Down
6 changes: 1 addition & 5 deletions ci/do_ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,8 @@ fi

export ENVOY_SRCDIR=$SOURCE_DIR

# google cloud build times out when using full throttle.
# additionally, we see builds killed due to OOM at high concurrency.
export NUM_CPUS=10
ben-taussig-solo marked this conversation as resolved.
Show resolved Hide resolved

# google cloud build doesn't like ipv6
export BAZEL_EXTRA_TEST_OPTIONS="--test_env=ENVOY_IP_TEST_VERSIONS=v4only --test_output=errors --jobs=${NUM_CPUS}"
export BAZEL_EXTRA_TEST_OPTIONS="--test_env=ENVOY_IP_TEST_VERSIONS=v4only --test_output=errors"

# We do not need/want to build the Envoy contrib filters so we replace the
# associated targets with the ENVOY_BUILD values
Expand Down
6 changes: 4 additions & 2 deletions cloudbuild.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
steps:

- name: 'gcr.io/cloud-builders/gcloud'
args: ['builds','submit','--config=ci/cloudbuild.yaml','--substitutions','TAG_NAME=$TAG_NAME,COMMIT_SHA=$COMMIT_SHA,_BUILD_TYPE=']
id: "standard"
args: ['builds','submit','--region=us-central1','--config=ci/cloudbuild.yaml','--substitutions','TAG_NAME=$TAG_NAME,COMMIT_SHA=$COMMIT_SHA,_BUILD_TYPE=']
ben-taussig-solo marked this conversation as resolved.
Show resolved Hide resolved

- name: 'gcr.io/cloud-builders/gcloud'
args: ['builds','submit','--config=ci/cloudbuild.yaml','--substitutions','COMMIT_SHA=$COMMIT_SHA,_BUILD_TYPE=clang-asan']
id: "asan"
args: ['builds','submit','--region=us-central1','--config=ci/cloudbuild.yaml','--substitutions','COMMIT_SHA=$COMMIT_SHA,_BUILD_TYPE=clang-asan']
waitFor: ['-']

timeout: 20000s
Loading