Add platforms to milestones.json
Adds platform information to milestones.json so that individual platforms can be enabled/disabled on milestones. Bug: chromium:1432491 Change-Id: I1269e93a72c476a17a371a87bf8008be217b85df Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/132520 Commit-Queue: Brian Sheedy <bsheedy@google.com> Reviewed-by: Garrett Beaty <gbeaty@google.com> Kokoro: Austin Eng <enga@chromium.org> Reviewed-by: Austin Eng <enga@chromium.org>
This commit is contained in:
parent
b0726080f4
commit
2ad7cd5236
|
@ -107,9 +107,6 @@ config_groups {
|
||||||
dry_run_access_list: "project-dawn-tryjob-access"
|
dry_run_access_list: "project-dawn-tryjob-access"
|
||||||
}
|
}
|
||||||
tryjob {
|
tryjob {
|
||||||
builders {
|
|
||||||
name: "chromium-m112/try/dawn-linux-x64-deps-rel"
|
|
||||||
}
|
|
||||||
builders {
|
builders {
|
||||||
name: "chromium-m112/try/dawn-mac-x64-deps-rel"
|
name: "chromium-m112/try/dawn-mac-x64-deps-rel"
|
||||||
}
|
}
|
||||||
|
|
|
@ -350,6 +350,7 @@ def dawn_standalone_builder(name, clang, debug, cpu, fuzzer = False):
|
||||||
cq_group = "Dawn-CQ",
|
cq_group = "Dawn-CQ",
|
||||||
builder = "dawn:try/" + name,
|
builder = "dawn:try/" + name,
|
||||||
)
|
)
|
||||||
|
|
||||||
# These builders run fine unbranched on branch CLs, so add them to the
|
# These builders run fine unbranched on branch CLs, so add them to the
|
||||||
# branch groups as well.
|
# branch groups as well.
|
||||||
for milestone in ACTIVE_MILESTONES.keys():
|
for milestone in ACTIVE_MILESTONES.keys():
|
||||||
|
@ -358,8 +359,10 @@ def dawn_standalone_builder(name, clang, debug, cpu, fuzzer = False):
|
||||||
builder = "dawn:try/" + name,
|
builder = "dawn:try/" + name,
|
||||||
)
|
)
|
||||||
|
|
||||||
def _add_branch_verifiers(builder_name, includable_only = False):
|
def _add_branch_verifiers(builder_name, os, includable_only = False):
|
||||||
for milestone, details in ACTIVE_MILESTONES.items():
|
for milestone, details in ACTIVE_MILESTONES.items():
|
||||||
|
if os not in details.platforms:
|
||||||
|
continue
|
||||||
luci.cq_tryjob_verifier(
|
luci.cq_tryjob_verifier(
|
||||||
cq_group = "Dawn-CQ-" + milestone,
|
cq_group = "Dawn-CQ-" + milestone,
|
||||||
builder = "{}:try/{}".format(details.chromium_project, builder_name),
|
builder = "{}:try/{}".format(details.chromium_project, builder_name),
|
||||||
|
@ -385,7 +388,7 @@ def chromium_dawn_tryjob(os):
|
||||||
cq_group = "Dawn-CQ",
|
cq_group = "Dawn-CQ",
|
||||||
builder = "chromium:try/" + os + "-dawn-rel",
|
builder = "chromium:try/" + os + "-dawn-rel",
|
||||||
)
|
)
|
||||||
_add_branch_verifiers(_os_to_branch_builder[os])
|
_add_branch_verifiers(_os_to_branch_builder[os], os)
|
||||||
|
|
||||||
luci.gitiles_poller(
|
luci.gitiles_poller(
|
||||||
name = "primary-poller",
|
name = "primary-poller",
|
||||||
|
@ -444,7 +447,7 @@ luci.cq_tryjob_verifier(
|
||||||
builder = "chromium:try/dawn-try-win10-x86-rel",
|
builder = "chromium:try/dawn-try-win10-x86-rel",
|
||||||
includable_only = True,
|
includable_only = True,
|
||||||
)
|
)
|
||||||
_add_branch_verifiers("dawn-win10-x86-deps-rel", includable_only = True)
|
_add_branch_verifiers("dawn-win10-x86-deps-rel", "win", includable_only = True)
|
||||||
|
|
||||||
# Views
|
# Views
|
||||||
|
|
||||||
|
|
|
@ -2,16 +2,30 @@
|
||||||
"112": {
|
"112": {
|
||||||
"name": "m112",
|
"name": "m112",
|
||||||
"chromium_project": "chromium-m112",
|
"chromium_project": "chromium-m112",
|
||||||
"ref": "refs/heads/chromium/5615"
|
"ref": "refs/heads/chromium/5615",
|
||||||
|
"platforms": [
|
||||||
|
"mac",
|
||||||
|
"win"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
"113": {
|
"113": {
|
||||||
"name": "m113",
|
"name": "m113",
|
||||||
"chromium_project": "chromium-m113",
|
"chromium_project": "chromium-m113",
|
||||||
"ref": "refs/heads/chromium/5672"
|
"ref": "refs/heads/chromium/5672",
|
||||||
|
"platforms": [
|
||||||
|
"linux",
|
||||||
|
"mac",
|
||||||
|
"win"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
"114": {
|
"114": {
|
||||||
"name": "m114",
|
"name": "m114",
|
||||||
"chromium_project": "chromium-m114",
|
"chromium_project": "chromium-m114",
|
||||||
"ref": "refs/heads/chromium/5735"
|
"ref": "refs/heads/chromium/5735",
|
||||||
|
"platforms": [
|
||||||
|
"linux",
|
||||||
|
"mac",
|
||||||
|
"win"
|
||||||
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -4,7 +4,7 @@
|
||||||
# found in the LICENSE file.
|
# found in the LICENSE file.
|
||||||
#
|
#
|
||||||
|
|
||||||
def _milestone_details(*, chromium_project, ref):
|
def _milestone_details(*, chromium_project, ref, platforms):
|
||||||
"""Define the details for an active milestone.
|
"""Define the details for an active milestone.
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
|
@ -12,14 +12,19 @@ def _milestone_details(*, chromium_project, ref):
|
||||||
milestone.
|
milestone.
|
||||||
* ref - The ref in the Dawn git repository that contains the code for the
|
* ref - The ref in the Dawn git repository that contains the code for the
|
||||||
milestone.
|
milestone.
|
||||||
|
* platforms - A list of platform strings that the milestone is active for.
|
||||||
"""
|
"""
|
||||||
return struct(
|
return struct(
|
||||||
chromium_project = chromium_project,
|
chromium_project = chromium_project,
|
||||||
ref = ref,
|
ref = ref,
|
||||||
|
platforms = platforms,
|
||||||
)
|
)
|
||||||
|
|
||||||
ACTIVE_MILESTONES = {
|
ACTIVE_MILESTONES = {
|
||||||
m["name"]: _milestone_details(
|
m["name"]: _milestone_details(
|
||||||
chromium_project = m["chromium_project"], ref = m["ref"])
|
chromium_project = m["chromium_project"],
|
||||||
|
ref = m["ref"],
|
||||||
|
platforms = m["platforms"],
|
||||||
|
)
|
||||||
for m in json.decode(io.read_file("./milestones.json")).values()
|
for m in json.decode(io.read_file("./milestones.json")).values()
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue