Skip to content

Commit

Permalink
5005: infra: Define reclient shadow builders only on trunk
Browse files Browse the repository at this point in the history 
A couple of these slipped into m102:
https://ci.chromium.org/search?q=reclient+shadow

This + a cherry pick should put them only on trunk.

Bug: None
Change-Id: I364c1c939260d98bab21d3ca8ddc8c779b0b21a0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3600992
Reviewed-by: Garrett Beaty <gbeaty@google.com>
Commit-Queue: Ben Pastene <bpastene@chromium.org>
Cr-Commit-Position: refs/branch-heads/5005@{#86}
Cr-Branched-From: 5b4d945-refs/heads/main@{#992738}
  • Loading branch information
@bpastene
bpastene authored and Chromium LUCI CQ committed Apr 21, 2022
1 parent 76100c4 commit 2d05f4d
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 342 deletions.
64 changes: 0 additions & 64 deletions ...config/generated/builders/ci/chromeos-amd64-generic-dbg (reclient shadow)/properties.json
View file

This file was deleted.

65 changes: 0 additions & 65 deletions infra/config/generated/builders/ci/chromeos-kevin-rel (reclient shadow)/properties.json
View file

This file was deleted.

164 changes: 0 additions & 164 deletions infra/config/generated/luci/cr-buildbucket.cfg
View file
Expand Up @@ -5760,88 +5760,6 @@ buckets {
}
}
}
builders {
name: "chromeos-amd64-generic-dbg (reclient shadow)"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
exe {
cipd_package: "infra/chromium/bootstrapper/${platform}"
cipd_version: "latest"
cmd: "bootstrapper"
}
properties:
'{'
' "$bootstrap/exe": {'
' "exe": {'
' "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
' "cipd_version": "refs/heads/main",'
' "cmd": ['
' "luciexe"'
' ]'
' }'
' },'
' "$bootstrap/properties": {'
' "properties_file": "infra/config/generated/builders/ci/chromeos-amd64-generic-dbg (reclient shadow)/properties.json",'
' "top_level_project": {'
' "ref": "refs/branch-heads/5005",'
' "repo": {'
' "host": "chromium.googlesource.com",'
' "project": "chromium/src"'
' }'
' }'
' },'
' "builder_group": "chromium.chromiumos",'
' "led_builder_is_bootstrapped": true,'
' "recipe": "chromium",'
' "sheriff_rotations": ['
' "chrome_browser_release"'
' ]'
'}'
execution_timeout_secs: 10800
build_numbers: YES
service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
experiments {
key: "luci.recipes.use_python3"
value: 100
}
resultdb {
enable: true
bq_exports {
project: "chrome-luci-data"
dataset: "chromium"
table: "ci_test_results"
test_results {}
}
bq_exports {
project: "chrome-luci-data"
dataset: "chromium"
table: "gpu_ci_test_results"
test_results {
predicate {
test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
}
}
}
bq_exports {
project: "chrome-luci-data"
dataset: "chromium"
table: "blink_web_tests_ci_test_results"
test_results {
predicate {
test_id_regexp: "ninja://[^/]*blink_web_tests/.+"
}
}
}
history_options {
use_invocation_timestamp: true
}
}
}
builders {
name: "chromeos-amd64-generic-lacros-dbg"
swarming_host: "chromium-swarm.appspot.com"
Expand Down Expand Up @@ -6252,88 +6170,6 @@ buckets {
}
}
}
builders {
name: "chromeos-kevin-rel (reclient shadow)"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
exe {
cipd_package: "infra/chromium/bootstrapper/${platform}"
cipd_version: "latest"
cmd: "bootstrapper"
}
properties:
'{'
' "$bootstrap/exe": {'
' "exe": {'
' "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
' "cipd_version": "refs/heads/main",'
' "cmd": ['
' "luciexe"'
' ]'
' }'
' },'
' "$bootstrap/properties": {'
' "properties_file": "infra/config/generated/builders/ci/chromeos-kevin-rel (reclient shadow)/properties.json",'
' "top_level_project": {'
' "ref": "refs/branch-heads/5005",'
' "repo": {'
' "host": "chromium.googlesource.com",'
' "project": "chromium/src"'
' }'
' }'
' },'
' "builder_group": "chromium.chromiumos",'
' "led_builder_is_bootstrapped": true,'
' "recipe": "chromium",'
' "sheriff_rotations": ['
' "chrome_browser_release"'
' ]'
'}'
execution_timeout_secs: 10800
build_numbers: YES
service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
experiments {
key: "luci.recipes.use_python3"
value: 100
}
resultdb {
enable: true
bq_exports {
project: "chrome-luci-data"
dataset: "chromium"
table: "ci_test_results"
test_results {}
}
bq_exports {
project: "chrome-luci-data"
dataset: "chromium"
table: "gpu_ci_test_results"
test_results {
predicate {
test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
}
}
}
bq_exports {
project: "chrome-luci-data"
dataset: "chromium"
table: "blink_web_tests_ci_test_results"
test_results {
predicate {
test_id_regexp: "ninja://[^/]*blink_web_tests/.+"
}
}
}
history_options {
use_invocation_timestamp: true
}
}
}
builders {
name: "fuchsia-arm64-cast"
swarming_host: "chromium-swarm.appspot.com"
Expand Down
25 changes: 0 additions & 25 deletions infra/config/generated/luci/luci-milo.cfg
View file
Expand Up @@ -240,11 +240,6 @@ consoles {
category: "chromium.chromiumos|simple|release"
short_name: "kvn"
}
builders {
name: "buildbucket/luci.chromium-m102.ci/chromeos-kevin-rel (reclient shadow)"
category: "chromium.chromiumos|simple|release"
short_name: "kvn"
}
builders {
name: "buildbucket/luci.chromium-m102.ci/chromeos-amd64-generic-rel"
category: "chromium.chromiumos|simple|release|x64"
Expand All @@ -255,11 +250,6 @@ consoles {
category: "chromium.chromiumos|simple|debug|x64"
short_name: "dbg"
}
builders {
name: "buildbucket/luci.chromium-m102.ci/chromeos-amd64-generic-dbg (reclient shadow)"
category: "chromium.chromiumos|simple|debug|x64"
short_name: "dbg"
}
builders {
name: "buildbucket/luci.chromium-m102.ci/android-cronet-arm-dbg"
category: "chromium.android|cronet|arm"
Expand Down Expand Up @@ -699,11 +689,6 @@ consoles {
category: "chromium.chromiumos|simple|debug|x64"
short_name: "dbg"
}
builders {
name: "buildbucket/luci.chromium-m102.ci/chromeos-amd64-generic-dbg (reclient shadow)"
category: "chromium.chromiumos|simple|debug|x64"
short_name: "dbg"
}
builders {
name: "buildbucket/luci.chromium-m102.ci/android-cronet-arm-dbg"
category: "chromium.android|cronet|arm"
Expand Down Expand Up @@ -1383,11 +1368,6 @@ consoles {
category: "simple|release"
short_name: "kvn"
}
builders {
name: "buildbucket/luci.chromium-m102.ci/chromeos-kevin-rel (reclient shadow)"
category: "simple|release"
short_name: "kvn"
}
builders {
name: "buildbucket/luci.chromium-m102.ci/chromeos-amd64-generic-rel"
category: "simple|release|x64"
Expand All @@ -1398,11 +1378,6 @@ consoles {
category: "simple|debug|x64"
short_name: "dbg"
}
builders {
name: "buildbucket/luci.chromium-m102.ci/chromeos-amd64-generic-dbg (reclient shadow)"
category: "simple|debug|x64"
short_name: "dbg"
}
header {
oncalls {
name: "Chromium Branches"
Expand Down

0 comments on commit 2d05f4d

Please sign in to comment.