From c90a6dcacc4e4819df8a266f2e36da2bbe7784c0 Mon Sep 17 00:00:00 2001 From: Kenneth Russell Date: Thu, 26 Aug 2021 21:54:54 -0700 Subject: [PATCH] Deduplicate autoroller docs. Leave them centralized in ANGLEWrangling.md, link to them from BranchingAndRolling.md, and add the Chromium-into-ANGLE autoroller. Bug: angleproject:6323 Change-Id: I913954b92dbe3545320e662de122daf26140d425 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3124341 Reviewed-by: Jamie Madill Reviewed-by: Yuly Novikov Commit-Queue: Kenneth Russell --- doc/BranchingAndRolling.md | 15 +++------------ infra/ANGLEWrangling.md | 11 ++++++----- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/doc/BranchingAndRolling.md b/doc/BranchingAndRolling.md index c1b9e4642..90f9272a3 100644 --- a/doc/BranchingAndRolling.md +++ b/doc/BranchingAndRolling.md @@ -15,18 +15,9 @@ appropriate testing. ## Autorollers At present, autorollers manage both the ANGLE roll into Chromium, and -the Chromium roll into ANGLE. - -The top-level page for the ANGLE autoroller into Chromium is: -[https://autoroll.skia.org/r/angle-chromium-autoroll](https://autoroll.skia.org/r/angle-chromium-autoroll) - -The top-level page for the Chromium autoroller into ANGLE is: -[https://autoroll.skia.org/r/chromium-angle-autoroll](https://autoroll.skia.org/r/chromium-angle-autoroll) - -Each of these can be triggered manually if necessary by logging in -with appropriate credentials. The Chromium-into-ANGLE autoroller in -particular usually only runs daily, and sometimes when adding or -removing test suppressions it's advantageous to run it more often. +the Chromium roll into ANGLE. All of the ANGLE-related autorollers are +documented in the [ANGLE Wrangling +documentation](../infra/ANGLEWrangling.md#the-auto-rollers). ## Manually rolling DEPS diff --git a/infra/ANGLEWrangling.md b/infra/ANGLEWrangling.md index 4b919cbbc..13950695e 100644 --- a/infra/ANGLEWrangling.md +++ b/infra/ANGLEWrangling.md @@ -90,7 +90,7 @@ the Label `Hotlist-PixelWrangler` for bugs that aren't caused by ANGLE regressio 1. Use this URL: `https://chromium.googlesource.com/angle/angle.git/+log/..` -## Task 3: The Auto-Rollers +## Task 3: The Auto-Rollers The [ANGLE auto-roller](https://autoroll.skia.org/r/angle-chromium-autoroll) automatically updates Chrome with the latest ANGLE changes. @@ -100,16 +100,17 @@ Chrome with the latest ANGLE changes. 1. **Chrome Branching**: You are responsible for pausing the roller 24h before branch days, and resuming afterwards. See the [Chrome Release Schedule](https://chromiumdash.appspot.com/schedule). -We also use additional auto-rollers to roll third party libraries into ANGLE once per day: +We also use additional auto-rollers to roll third party libraries, and Chromium, into ANGLE once per day: * [SwiftShader into ANGLE](https://autoroll.skia.org/r/swiftshader-angle-autoroll) * [vulkan-deps into ANGLE](https://autoroll.skia.org/r/vulkan-deps-angle-autoroll) * [VK-GL-CTS into ANGLE](https://autoroll.skia.org/r/vk-gl-cts-angle-autoroll?tab=status) + * [Chromium into ANGLE](https://autoroll.skia.org/r/chromium-angle-autoroll) Please ensure these rollers are also healthy and unblocked. You can trigger manual rolls using the -dashboards to land high-priority changes. When a roll fails, stop the roller, determine if the root -cause is a problem with ANGLE or with the upstream repo, and file an issue with an appropriate next -step. +dashboards to land high-priority changes, for example Chromium-side test expectation updates or +suppressions. When a roll fails, stop the roller, determine if the root cause is a problem with +ANGLE or with the upstream repo, and file an issue with an appropriate next step. The autoroller configurations live in the [skia/buildbot repository](https://skia.googlesource.com/buildbot/) in the [autoroll/config](https://skia.googlesource.com/buildbot/+/main/autoroll/config) folder.