Skip to content

Commit 8d1a9ad

Browse files
Sven ZhengChromium LUCI CQ
Sven Zheng
authored and
Chromium LUCI CQ
committed
Revert "[COIL] Change chromium code search type links to use main rather than master for infra"
This reverts commit 0d5852f. Reason for revert: Breaks webrtc https://ci.chromium.org/p/chromium/builders/webrtc/WebRTC%20Chromium%20Mac%20Builder/47408 Original change's description: > [COIL] Change chromium code search type links to use main rather than master for infra > > See this doc: go/chromium-coil-change for more info > BUG=1210385 > > Change-Id: I37c32edb931ae4e96f2ee9aea24bd67e406ca1bd > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2902284 > Reviewed-by: Dirk Pranke <[email protected]> > Commit-Queue: John Palmer <[email protected]> > Cr-Commit-Position: refs/heads/master@{#886507} Bug: 1210385, 1213929 Change-Id: I699febf5f4735301f2908cbeed127e567eb49af5 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2924407 Bot-Commit: Rubber Stamper <[email protected]> Reviewed-by: John Palmer <[email protected]> Reviewed-by: Dirk Pranke <[email protected]> Commit-Queue: Sven Zheng <[email protected]> Cr-Commit-Position: refs/heads/master@{#888108}
1 parent ff4e5f6 commit 8d1a9ad

12 files changed

+73
-73
lines changed

infra/DIR_METADATA

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Metadata information for this directory.
22
#
33
# For more information on DIR_METADATA files, see:
4-
# https://source.chromium.org/chromium/infra/infra/+/main:go/src/infra/tools/dirmd/README.md
4+
# https://source.chromium.org/chromium/infra/infra/+/master:go/src/infra/tools/dirmd/README.md
55
#
66
# For the schema of this file, see Metadata message:
7-
# https://source.chromium.org/chromium/infra/infra/+/main:go/src/infra/tools/dirmd/proto/dir_metadata.proto
7+
# https://source.chromium.org/chromium/infra/infra/+/master:go/src/infra/tools/dirmd/proto/dir_metadata.proto
88

99
monorail {
1010
component: "Infra>Client>Chrome"

infra/config/PRESUBMIT.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -122,19 +122,19 @@ def CheckOutagesConfigOnCommit(input_api, output_api):
122122
for k, v in sorted(outages_config.items())]
123123
return [
124124
output_api.PresubmitError('\n'.join([
125-
'The following outages configuration is in effect:\n {}'.format(
126-
'\n '.join(outages_config_lines)),
125+
'The following outages configuration is in effect:\n {}'
126+
.format('\n '.join(outages_config_lines)),
127127
('The effect of your change may not be visible '
128128
'in the generated configuration.'),
129129
('If your change is addressing the outage, '
130-
'please add the footer {} with a link for the outage.'
131-
).format(_OUTAGE_ACTION_FOOTER),
130+
'please add the footer {} with a link for the outage.')
131+
.format(_OUTAGE_ACTION_FOOTER),
132132
('If your change is not addressing the outage '
133133
'but you still wish to land it, please add the footer '
134-
'{} with a reason.').format(_IGNORE_OUTAGE_FOOTER),
134+
'{} with a reason.')
135+
.format(_IGNORE_OUTAGE_FOOTER),
135136
('For more information on outages configuration, '
136-
'see https://chromium.googlesource.com/chromium/src/+/refs/heads/main/infra/config/outages'
137-
),
137+
'see https://chromium.googlesource.com/chromium/src/+/refs/heads/master/infra/config/outages'),
138138
])),
139139
]
140140

infra/config/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
**IMPORTANT:** This branch only has an effect for branches that have projects
22
set up in
3-
https://chrome-internal.googlesource.com/infradata/config/+/refs/heads/main/configs/luci-config/projects.cfg
3+
https://chrome-internal.googlesource.com/infradata/config/+/refs/heads/master/configs/luci-config/projects.cfg
44

55
This directory contains chromium project-wide configurations
66
for Chrome Operations services.

infra/config/dev/chromium-header.textpb

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ links: {
9393
}
9494
links: {
9595
text: "customize"
96-
url: "https://chromium.googlesource.com/chromium/src/+/main/infra/config/luci-milo-dev.cfg"
96+
url: "https://chromium.googlesource.com/chromium/src/+/master/infra/config/luci-milo-dev.cfg"
9797
alt: "Customize this console"
9898
}
9999
}

infra/config/generated/luci-milo-dev.cfg

+2-2
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ consoles {
116116
}
117117
links {
118118
text: "customize"
119-
url: "https://chromium.googlesource.com/chromium/src/+/main/infra/config/luci-milo-dev.cfg"
119+
url: "https://chromium.googlesource.com/chromium/src/+/master/infra/config/luci-milo-dev.cfg"
120120
alt: "Customize this console"
121121
}
122122
}
@@ -226,7 +226,7 @@ consoles {
226226
}
227227
links {
228228
text: "customize"
229-
url: "https://chromium.googlesource.com/chromium/src/+/main/infra/config/luci-milo-dev.cfg"
229+
url: "https://chromium.googlesource.com/chromium/src/+/master/infra/config/luci-milo-dev.cfg"
230230
alt: "Customize this console"
231231
}
232232
}

0 commit comments

Comments
 (0)