Chromium lkgr is no longer updated. Use lkcr
Bug: skia:6916
Change-Id: I16badf80c3b34e517b8baab161150c9434f325aa
Reviewed-on: https://skia-review.googlesource.com/30100
Commit-Queue: Ravi Mistry <rmistry@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
diff --git a/infra/bots/recipe_modules/core/api.py b/infra/bots/recipe_modules/core/api.py
index 3db64c2..46ea4ec 100644
--- a/infra/bots/recipe_modules/core/api.py
+++ b/infra/bots/recipe_modules/core/api.py
@@ -119,7 +119,7 @@
chromium.name = 'src'
chromium.managed = False
chromium.url = 'https://chromium.googlesource.com/chromium/src.git'
- chromium.revision = 'origin/lkgr'
+ chromium.revision = 'origin/lkcr'
# Run bot_update.
diff --git a/infra/bots/recipe_modules/core/examples/full.expected/Housekeeper-Weekly-RecreateSKPs.json b/infra/bots/recipe_modules/core/examples/full.expected/Housekeeper-Weekly-RecreateSKPs.json
index 8ff92bb..ec56896 100644
--- a/infra/bots/recipe_modules/core/examples/full.expected/Housekeeper-Weekly-RecreateSKPs.json
+++ b/infra/bots/recipe_modules/core/examples/full.expected/Housekeeper-Weekly-RecreateSKPs.json
@@ -47,7 +47,7 @@
"--revision",
"skia@abc123",
"--revision",
- "src@origin/lkgr"
+ "src@origin/lkcr"
],
"cwd": "[CUSTOM_/_B_WORK]",
"env": {
@@ -63,7 +63,7 @@
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"skia\": \"abc123\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": \"origin/lkgr\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"src\": \"origin/lkcr\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"skia\": {@@@",
diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json
index ef8a16c..9ef412b 100644
--- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json
+++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json
@@ -47,7 +47,7 @@
"--revision",
"skia@abc123",
"--revision",
- "src@origin/lkgr"
+ "src@origin/lkcr"
],
"cwd": "[CUSTOM_/_B_WORK]",
"env": {
@@ -63,7 +63,7 @@
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"skia\": \"abc123\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": \"origin/lkgr\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"src\": \"origin/lkcr\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"skia\": {@@@",
diff --git a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json
index f1dfef6..45d0676 100644
--- a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json
+++ b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json
@@ -47,7 +47,7 @@
"--revision",
"skia@abc123",
"--revision",
- "src@origin/lkgr"
+ "src@origin/lkcr"
],
"cwd": "[CUSTOM_/_B_WORK]",
"env": {
@@ -63,7 +63,7 @@
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"skia\": \"abc123\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": \"origin/lkgr\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"src\": \"origin/lkcr\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"skia\": {@@@",
diff --git a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json
index 4119fbf..6d108fe 100644
--- a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json
+++ b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json
@@ -47,7 +47,7 @@
"--revision",
"skia@abc123",
"--revision",
- "src@origin/lkgr"
+ "src@origin/lkcr"
],
"cwd": "[CUSTOM_/_B_WORK]",
"env": {
@@ -63,7 +63,7 @@
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"skia\": \"abc123\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": \"origin/lkgr\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"src\": \"origin/lkcr\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"skia\": {@@@",
diff --git a/infra/bots/recipes/recreate_skps.expected/failed_upload.json b/infra/bots/recipes/recreate_skps.expected/failed_upload.json
index 0647f27..3404164 100644
--- a/infra/bots/recipes/recreate_skps.expected/failed_upload.json
+++ b/infra/bots/recipes/recreate_skps.expected/failed_upload.json
@@ -47,7 +47,7 @@
"--revision",
"skia@abc123",
"--revision",
- "src@origin/lkgr"
+ "src@origin/lkcr"
],
"cwd": "[CUSTOM_/_B_WORK]",
"env": {
@@ -63,7 +63,7 @@
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"skia\": \"abc123\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": \"origin/lkgr\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"src\": \"origin/lkcr\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"skia\": {@@@",
diff --git a/tools/skp/page_sets/skia_carsvg_desktop.py b/tools/skp/page_sets/skia_carsvg_desktop.py
index 8b9cc05..85c813f 100644
--- a/tools/skp/page_sets/skia_carsvg_desktop.py
+++ b/tools/skp/page_sets/skia_carsvg_desktop.py
@@ -14,6 +14,7 @@
def __init__(self, url, page_set):
super(SkiaBuildbotDesktopPage, self).__init__(
url=url,
+ name=url,
page_set=page_set,
credentials_path='data/credentials.json',
shared_page_state_class=shared_page_state.SharedDesktopPageState)
diff --git a/tools/skp/page_sets/skia_chalkboard_desktop.py b/tools/skp/page_sets/skia_chalkboard_desktop.py
index 5aedcda..acf8ef3 100644
--- a/tools/skp/page_sets/skia_chalkboard_desktop.py
+++ b/tools/skp/page_sets/skia_chalkboard_desktop.py
@@ -14,6 +14,7 @@
def __init__(self, url, page_set):
super(SkiaBuildbotDesktopPage, self).__init__(
url=url,
+ name=url,
page_set=page_set,
credentials_path='data/credentials.json',
shared_page_state_class=shared_page_state.SharedDesktopPageState)
diff --git a/tools/skp/page_sets/skia_css3gradients_desktop.py b/tools/skp/page_sets/skia_css3gradients_desktop.py
index c6ddb63..fa6d7b6 100644
--- a/tools/skp/page_sets/skia_css3gradients_desktop.py
+++ b/tools/skp/page_sets/skia_css3gradients_desktop.py
@@ -14,6 +14,7 @@
def __init__(self, url, page_set):
super(SkiaBuildbotDesktopPage, self).__init__(
url=url,
+ name=url,
page_set=page_set,
credentials_path='data/credentials.json',
shared_page_state_class=shared_page_state.SharedDesktopPageState)
diff --git a/tools/skp/page_sets/skia_digg_nexus10.py b/tools/skp/page_sets/skia_digg_nexus10.py
index 2d3288f..b42d5f8 100644
--- a/tools/skp/page_sets/skia_digg_nexus10.py
+++ b/tools/skp/page_sets/skia_digg_nexus10.py
@@ -14,6 +14,7 @@
def __init__(self, url, page_set):
super(SkiaBuildbotDesktopPage, self).__init__(
url=url,
+ name=url,
page_set=page_set,
credentials_path='data/credentials.json',
shared_page_state_class=shared_page_state.Shared10InchTabletPageState)
diff --git a/tools/skp/page_sets/skia_espn_desktop.py b/tools/skp/page_sets/skia_espn_desktop.py
index a7c7e20..725f330 100644
--- a/tools/skp/page_sets/skia_espn_desktop.py
+++ b/tools/skp/page_sets/skia_espn_desktop.py
@@ -14,6 +14,7 @@
def __init__(self, url, page_set):
super(SkiaBuildbotDesktopPage, self).__init__(
url=url,
+ name=url,
page_set=page_set,
credentials_path='data/credentials.json',
shared_page_state_class=shared_page_state.SharedDesktopPageState)
diff --git a/tools/skp/page_sets/skia_gamedeksiam_nexus10.py b/tools/skp/page_sets/skia_gamedeksiam_nexus10.py
index 1f36f1d..256de8c 100644
--- a/tools/skp/page_sets/skia_gamedeksiam_nexus10.py
+++ b/tools/skp/page_sets/skia_gamedeksiam_nexus10.py
@@ -14,6 +14,7 @@
def __init__(self, url, page_set):
super(SkiaBuildbotDesktopPage, self).__init__(
url=url,
+ name=url,
page_set=page_set,
credentials_path='data/credentials.json',
shared_page_state_class=shared_page_state.Shared10InchTabletPageState)
diff --git a/tools/skp/page_sets/skia_gmail_nexus10.py b/tools/skp/page_sets/skia_gmail_nexus10.py
index 9a3411d..8800dad 100644
--- a/tools/skp/page_sets/skia_gmail_nexus10.py
+++ b/tools/skp/page_sets/skia_gmail_nexus10.py
@@ -14,6 +14,7 @@
def __init__(self, url, page_set):
super(SkiaBuildbotDesktopPage, self).__init__(
url=url,
+ name=url,
page_set=page_set,
credentials_path='data/credentials.json',
shared_page_state_class=shared_page_state.Shared10InchTabletPageState)
diff --git a/tools/skp/page_sets/skia_gmailthread_desktop.py b/tools/skp/page_sets/skia_gmailthread_desktop.py
index 6316b0b..e7d0bc8 100644
--- a/tools/skp/page_sets/skia_gmailthread_desktop.py
+++ b/tools/skp/page_sets/skia_gmailthread_desktop.py
@@ -14,6 +14,7 @@
def __init__(self, url, page_set):
super(SkiaBuildbotDesktopPage, self).__init__(
url=url,
+ name=url,
page_set=page_set,
credentials_path='data/credentials.json',
shared_page_state_class=shared_page_state.SharedDesktopPageState)
diff --git a/tools/skp/page_sets/skia_googlehome_desktop.py b/tools/skp/page_sets/skia_googlehome_desktop.py
index 5c5779c..9cfee02 100644
--- a/tools/skp/page_sets/skia_googlehome_desktop.py
+++ b/tools/skp/page_sets/skia_googlehome_desktop.py
@@ -14,6 +14,7 @@
def __init__(self, url, page_set):
super(SkiaBuildbotDesktopPage, self).__init__(
url=url,
+ name=url,
page_set=page_set,
credentials_path='data/credentials.json',
shared_page_state_class=shared_page_state.SharedDesktopPageState)
diff --git a/tools/skp/page_sets/skia_googlespreadsheet_desktop.py b/tools/skp/page_sets/skia_googlespreadsheet_desktop.py
index ce65456..c85d1e8 100644
--- a/tools/skp/page_sets/skia_googlespreadsheet_desktop.py
+++ b/tools/skp/page_sets/skia_googlespreadsheet_desktop.py
@@ -14,6 +14,7 @@
def __init__(self, url, page_set):
super(SkiaBuildbotDesktopPage, self).__init__(
url=url,
+ name=url,
page_set=page_set,
credentials_path='data/credentials.json',
shared_page_state_class=shared_page_state.SharedDesktopPageState)
diff --git a/tools/skp/page_sets/skia_jsfiddlebigcar_desktop.py b/tools/skp/page_sets/skia_jsfiddlebigcar_desktop.py
index 57b14fd..43be5de 100644
--- a/tools/skp/page_sets/skia_jsfiddlebigcar_desktop.py
+++ b/tools/skp/page_sets/skia_jsfiddlebigcar_desktop.py
@@ -14,6 +14,7 @@
def __init__(self, url, page_set):
super(SkiaBuildbotDesktopPage, self).__init__(
url=url,
+ name=url,
page_set=page_set,
credentials_path='data/credentials.json',
shared_page_state_class=shared_page_state.SharedDesktopPageState)
diff --git a/tools/skp/page_sets/skia_mapsvg_desktop.py b/tools/skp/page_sets/skia_mapsvg_desktop.py
index a5f7649..1a1af34 100644
--- a/tools/skp/page_sets/skia_mapsvg_desktop.py
+++ b/tools/skp/page_sets/skia_mapsvg_desktop.py
@@ -14,6 +14,7 @@
def __init__(self, url, page_set):
super(SkiaBuildbotDesktopPage, self).__init__(
url=url,
+ name=url,
page_set=page_set,
credentials_path='data/credentials.json',
shared_page_state_class=shared_page_state.SharedDesktopPageState)
diff --git a/tools/skp/page_sets/skia_mozilla_nexus10.py b/tools/skp/page_sets/skia_mozilla_nexus10.py
index be56b4c..fea443d 100644
--- a/tools/skp/page_sets/skia_mozilla_nexus10.py
+++ b/tools/skp/page_sets/skia_mozilla_nexus10.py
@@ -14,6 +14,7 @@
def __init__(self, url, page_set):
super(SkiaBuildbotDesktopPage, self).__init__(
url=url,
+ name=url,
page_set=page_set,
credentials_path='data/credentials.json',
shared_page_state_class=shared_page_state.SharedDesktopPageState)
diff --git a/tools/skp/page_sets/skia_nytimes_desktop.py b/tools/skp/page_sets/skia_nytimes_desktop.py
index 6276bdf..aab0abb 100644
--- a/tools/skp/page_sets/skia_nytimes_desktop.py
+++ b/tools/skp/page_sets/skia_nytimes_desktop.py
@@ -14,6 +14,7 @@
def __init__(self, url, page_set):
super(SkiaBuildbotDesktopPage, self).__init__(
url=url,
+ name=url,
page_set=page_set,
credentials_path='data/credentials.json',
shared_page_state_class=shared_page_state.SharedDesktopPageState)
diff --git a/tools/skp/page_sets/skia_pokemonwiki_desktop.py b/tools/skp/page_sets/skia_pokemonwiki_desktop.py
index def33eb..4f14a20 100644
--- a/tools/skp/page_sets/skia_pokemonwiki_desktop.py
+++ b/tools/skp/page_sets/skia_pokemonwiki_desktop.py
@@ -14,6 +14,7 @@
def __init__(self, url, page_set):
super(SkiaBuildbotDesktopPage, self).__init__(
url=url,
+ name=url,
page_set=page_set,
credentials_path='data/credentials.json',
shared_page_state_class=shared_page_state.SharedDesktopPageState)
diff --git a/tools/skp/page_sets/skia_pravda_nexus10.py b/tools/skp/page_sets/skia_pravda_nexus10.py
index 35d042e..b2db406 100644
--- a/tools/skp/page_sets/skia_pravda_nexus10.py
+++ b/tools/skp/page_sets/skia_pravda_nexus10.py
@@ -14,6 +14,7 @@
def __init__(self, url, page_set):
super(SkiaBuildbotDesktopPage, self).__init__(
url=url,
+ name=url,
page_set=page_set,
credentials_path='data/credentials.json',
shared_page_state_class=shared_page_state.Shared10InchTabletPageState)
diff --git a/tools/skp/page_sets/skia_samoasvg_desktop.py b/tools/skp/page_sets/skia_samoasvg_desktop.py
index ca2e907..ce831d7 100644
--- a/tools/skp/page_sets/skia_samoasvg_desktop.py
+++ b/tools/skp/page_sets/skia_samoasvg_desktop.py
@@ -14,6 +14,7 @@
def __init__(self, url, page_set):
super(SkiaBuildbotDesktopPage, self).__init__(
url=url,
+ name=url,
page_set=page_set,
credentials_path='data/credentials.json',
shared_page_state_class=shared_page_state.SharedDesktopPageState)
diff --git a/tools/skp/page_sets/skia_theverge_desktop.py b/tools/skp/page_sets/skia_theverge_desktop.py
index 76f3a92..a95ade3 100644
--- a/tools/skp/page_sets/skia_theverge_desktop.py
+++ b/tools/skp/page_sets/skia_theverge_desktop.py
@@ -14,6 +14,7 @@
def __init__(self, url, page_set):
super(SkiaBuildbotDesktopPage, self).__init__(
url=url,
+ name=url,
page_set=page_set,
credentials_path='data/credentials.json',
shared_page_state_class=shared_page_state.SharedDesktopPageState)
diff --git a/tools/skp/page_sets/skia_tiger8svg_desktop.py b/tools/skp/page_sets/skia_tiger8svg_desktop.py
index d950a74..127fa2a 100644
--- a/tools/skp/page_sets/skia_tiger8svg_desktop.py
+++ b/tools/skp/page_sets/skia_tiger8svg_desktop.py
@@ -14,6 +14,7 @@
def __init__(self, url, page_set):
super(SkiaBuildbotDesktopPage, self).__init__(
url=url,
+ name=url,
page_set=page_set,
credentials_path='data/credentials.json',
shared_page_state_class=shared_page_state.SharedDesktopPageState)
diff --git a/tools/skp/page_sets/skia_tigersvg_desktop.py b/tools/skp/page_sets/skia_tigersvg_desktop.py
index fb40acb..26c1a01 100644
--- a/tools/skp/page_sets/skia_tigersvg_desktop.py
+++ b/tools/skp/page_sets/skia_tigersvg_desktop.py
@@ -14,6 +14,7 @@
def __init__(self, url, page_set):
super(SkiaBuildbotDesktopPage, self).__init__(
url=url,
+ name=url,
page_set=page_set,
credentials_path='data/credentials.json',
shared_page_state_class=shared_page_state.SharedDesktopPageState)
diff --git a/tools/skp/page_sets/skia_ugamsolutions_desktop.py b/tools/skp/page_sets/skia_ugamsolutions_desktop.py
index 26b643e..24aac58 100644
--- a/tools/skp/page_sets/skia_ugamsolutions_desktop.py
+++ b/tools/skp/page_sets/skia_ugamsolutions_desktop.py
@@ -14,6 +14,7 @@
def __init__(self, url, page_set):
super(SkiaBuildbotDesktopPage, self).__init__(
url=url,
+ name=url,
page_set=page_set,
credentials_path='data/credentials.json',
shared_page_state_class=shared_page_state.SharedDesktopPageState)
diff --git a/tools/skp/page_sets/skia_unicodetable_desktop.py b/tools/skp/page_sets/skia_unicodetable_desktop.py
index b4c90f0..2b76f60 100644
--- a/tools/skp/page_sets/skia_unicodetable_desktop.py
+++ b/tools/skp/page_sets/skia_unicodetable_desktop.py
@@ -14,6 +14,7 @@
def __init__(self, url, page_set):
super(SkiaBuildbotDesktopPage, self).__init__(
url=url,
+ name=url,
page_set=page_set,
credentials_path='data/credentials.json',
shared_page_state_class=shared_page_state.SharedDesktopPageState)
diff --git a/tools/skp/page_sets/skia_wikipedia_desktop.py b/tools/skp/page_sets/skia_wikipedia_desktop.py
index 10bb061..c6188b1 100644
--- a/tools/skp/page_sets/skia_wikipedia_desktop.py
+++ b/tools/skp/page_sets/skia_wikipedia_desktop.py
@@ -14,6 +14,7 @@
def __init__(self, url, page_set):
super(SkiaBuildbotDesktopPage, self).__init__(
url=url,
+ name=url,
page_set=page_set,
credentials_path='data/credentials.json',
shared_page_state_class=shared_page_state.SharedDesktopPageState)
diff --git a/tools/skp/page_sets/skia_worldjournal_nexus10.py b/tools/skp/page_sets/skia_worldjournal_nexus10.py
index 713a4aa..d425c72 100644
--- a/tools/skp/page_sets/skia_worldjournal_nexus10.py
+++ b/tools/skp/page_sets/skia_worldjournal_nexus10.py
@@ -14,6 +14,7 @@
def __init__(self, url, page_set):
super(SkiaBuildbotDesktopPage, self).__init__(
url=url,
+ name=url,
page_set=page_set,
credentials_path='data/credentials.json',
shared_page_state_class=shared_page_state.Shared10InchTabletPageState)
diff --git a/tools/skp/page_sets/skia_wowwiki_desktop.py b/tools/skp/page_sets/skia_wowwiki_desktop.py
index 54e9acb..a036a57 100644
--- a/tools/skp/page_sets/skia_wowwiki_desktop.py
+++ b/tools/skp/page_sets/skia_wowwiki_desktop.py
@@ -14,6 +14,7 @@
def __init__(self, url, page_set):
super(SkiaBuildbotDesktopPage, self).__init__(
url=url,
+ name=url,
page_set=page_set,
credentials_path='data/credentials.json',
shared_page_state_class=shared_page_state.SharedDesktopPageState)
diff --git a/tools/skp/page_sets/skia_ynevsvg_desktop.py b/tools/skp/page_sets/skia_ynevsvg_desktop.py
index 04acd10..814d5d2 100644
--- a/tools/skp/page_sets/skia_ynevsvg_desktop.py
+++ b/tools/skp/page_sets/skia_ynevsvg_desktop.py
@@ -14,6 +14,7 @@
def __init__(self, url, page_set):
super(SkiaBuildbotDesktopPage, self).__init__(
url=url,
+ name=url,
page_set=page_set,
credentials_path='data/credentials.json',
shared_page_state_class=shared_page_state.SharedDesktopPageState)