Move the contents of infra/config branch to master in ANGLE |
|||||||||||||
Issue descriptionChromium used to have config data on the infra/config branch. This was confusing and the config moved to the directory infra/config on the master branch (https://docs.google.com/document/d/1pe1z2G1UMLmFAjYsX7z8OrRoZixEyG1LXhibldytrDc/edit#). That was a great change; we should do that in all repos (angle, pdfium, v8, ...). And ideally be consistent about the "global" and "branch" subdirs; looks like several repos already have infra/config/cq.cfg for just the cq config (which in src is in infra/config/branch instead).
,
Apr 17 2018
,
Apr 18 2018
This would be great - it's a bit confusing right now as we have a separate branch, with some of the config in the branch, and some in the infra/config folder in the main repo.
,
Apr 18 2018
,
May 22 2018
Andrii, can you generalize the instructions in https://docs.google.com/document/d/1pe1z2G1UMLmFAjYsX7z8OrRoZixEyG1LXhibldytrDc/edit#heading=h.xgjl2srtytjt so other repo owners can make the same changes? Even just listing them here is probably fine.
,
May 22 2018
I think repo owners generally can't do this because they generally don't have permissions for step 4 ("Update luci-config registration to point to new locations") as far as I know.
,
May 22 2018
Re #5: ok, I'll add 3 steps here. Re #6: "Update luci-config registration to point to new locations" requires lgtm from limited group of people, but every googler can create CLs in corresponding repository.
,
May 22 2018
Instructions for your repo: 1. Prepare CL to update luci-config registration of your project to point to new locations. You need to be a Googler for this. Example https://chrome-internal-review.googlesource.com/c/infradata/config/+/576769 2. Prepare CL for refs/heads/master branch: Copy existing master branch config from infra/config directory to infra/config/branch directory. Copy config from refs/heads/infra/config branch to infra/config/global directory on refs/heads/master branch, with infra/config/README.md documenting diff between configs. example https://chromium-review.googlesource.com/c/chromium/src/+/935582 3. Prepare CL to remove everything from refs/heads/infra/config (example https://chromium-review.googlesource.com/935921). Consider leaving tombstone README.md pointing to new location (example https://chromium.googlesource.com/chromium/src/+/f128a3c3a79b093e8f6d8752b2c8942139150e24/README.md) 4. File Infra>Platform>Admin with your intent and list prepared CLs. Link to this bug/comment in description. You may cc: tandrii@chromium.org . Propose a 1 hour timeslot to perform migration s.t. Admin can help in case of emergency. Get all CLs approved and ready to land. 5. During final switch hour: land CL (1) land CL (2) ensure luci-config sees your new config https://luci-config.appspot.com/#/projects/<project> hint: it may take ~10..20 minutes to this to kick in. Or ask Admin to "kick" luci-config service. if you have CQ, ensure CQ is still working by landing new whitespace CL. if you have CI, ensure it picks up new commits. declare success. land CL (3) 6. File Infra>Git>Admin bug to make refs/heads/infra/config branch read only.
,
May 22 2018
,
Aug 31
Is it OK if I restrict this to ANGLE and use it as a reference if other repos want to migrate? I'd like to try handling this one.
,
Aug 31
,
Nov 12
CL 1: https://chrome-internal-review.googlesource.com/c/infradata/config/+/715015 CL 2: https://chromium-review.googlesource.com/c/angle/angle/+/1330681 CL 3: https://chromium-review.googlesource.com/c/angle/angle/+/1330316
,
Nov 12
The following revision refers to this bug: https://chromium.googlesource.com/angle/angle/+/0b18583285cb2863f19522067bce9123b0eeb7be commit 0b18583285cb2863f19522067bce9123b0eeb7be Author: Jamie Madill <jmadill@chromium.org> Date: Mon Nov 12 22:37:57 2018 Copy configs from infra/config branch. Also adds some documentation and updates OWNERS. Bug: 833848 Change-Id: I1e9adf9b84a776efceb5a529a73310f515e50c70 Reviewed-on: https://chromium-review.googlesource.com/c/1330681 Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org> [add] https://crrev.com/0b18583285cb2863f19522067bce9123b0eeb7be/infra/config/global/luci-scheduler.cfg [rename] https://crrev.com/0b18583285cb2863f19522067bce9123b0eeb7be/infra/config/branch/cq.cfg [add] https://crrev.com/0b18583285cb2863f19522067bce9123b0eeb7be/infra/config/branch/OWNERS [add] https://crrev.com/0b18583285cb2863f19522067bce9123b0eeb7be/infra/config/branch/README.md [add] https://crrev.com/0b18583285cb2863f19522067bce9123b0eeb7be/infra/config/global/cr-buildbucket.cfg [modify] https://crrev.com/0b18583285cb2863f19522067bce9123b0eeb7be/infra/config/README.md [add] https://crrev.com/0b18583285cb2863f19522067bce9123b0eeb7be/infra/config/global/README.md [add] https://crrev.com/0b18583285cb2863f19522067bce9123b0eeb7be/infra/config/global/luci-milo.cfg [modify] https://crrev.com/0b18583285cb2863f19522067bce9123b0eeb7be/infra/config/OWNERS [add] https://crrev.com/0b18583285cb2863f19522067bce9123b0eeb7be/infra/config/global/OWNERS [add] https://crrev.com/0b18583285cb2863f19522067bce9123b0eeb7be/infra/config/global/project.cfg [add] https://crrev.com/0b18583285cb2863f19522067bce9123b0eeb7be/infra/config/global/luci-logdog.cfg
,
Nov 12
The following revision refers to this bug: https://chrome-internal.googlesource.com/infradata/config/+/ec038a43c7fdcdf66487ab8d53c47019e2f6478b commit ec038a43c7fdcdf66487ab8d53c47019e2f6478b Author: Jamie Madill <jmadill@chromium.org> Date: Mon Nov 12 22:37:22 2018
,
Nov 12
The following revision refers to this bug: https://chromium.googlesource.com/angle/angle/+/0ec2ba2137ce8867c05fe22c97a7b9ba87148f7f commit 0ec2ba2137ce8867c05fe22c97a7b9ba87148f7f Author: Jamie Madill <jmadill@chromium.org> Date: Mon Nov 12 22:43:46 2018 Whitespace change to cq.cfg. This should trigger luci-config. Also updates OWNERS which were missed from the last commit. Tbr: tandrii@chromium.org Bug: chromium:833848 Change-Id: I23e1583d760acd4addd10f8b224518c702d8745f Reviewed-on: https://chromium-review.googlesource.com/c/1332528 Reviewed-by: Jamie Madill <jmadill@chromium.org> [modify] https://crrev.com/0ec2ba2137ce8867c05fe22c97a7b9ba87148f7f/infra/config/global/OWNERS [modify] https://crrev.com/0ec2ba2137ce8867c05fe22c97a7b9ba87148f7f/infra/config/branch/OWNERS [modify] https://crrev.com/0ec2ba2137ce8867c05fe22c97a7b9ba87148f7f/infra/config/OWNERS [modify] https://crrev.com/0ec2ba2137ce8867c05fe22c97a7b9ba87148f7f/infra/config/branch/cq.cfg
,
Nov 12
The following revision refers to this bug: https://chromium.googlesource.com/angle/angle/+/5da0d5c4fac9bbeb65d882aebf86d11ff3bc66d0 commit 5da0d5c4fac9bbeb65d882aebf86d11ff3bc66d0 Author: Jamie Madill <jmadill@chromium.org> Date: Mon Nov 12 22:47:29 2018 Add missing refs.cfg. This is necessary for CQ/Luci operation. Bug: 833848 Change-Id: Ib42216d3a2ee58e819f42fc9535fa91797f55200 Reviewed-on: https://chromium-review.googlesource.com/c/1332529 Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org> [add] https://crrev.com/5da0d5c4fac9bbeb65d882aebf86d11ff3bc66d0/infra/config/global/refs.cfg
,
Nov 12
The following revision refers to this bug: https://chromium.googlesource.com/angle/angle/+/a31b747cfa1b663701c9008f0a4cf0b0516d5d16 commit a31b747cfa1b663701c9008f0a4cf0b0516d5d16 Author: Jamie Madill <jmadill@chromium.org> Date: Mon Nov 12 22:48:50 2018 Whitespace change to cq.cfg. Pick up the correct config after refs.cfg was added. Bug: 833848 Change-Id: I472f2ca56598ef2ddf030b28ef87f3f52829b610 Reviewed-on: https://chromium-review.googlesource.com/c/1332530 Reviewed-by: Jamie Madill <jmadill@chromium.org> [modify] https://crrev.com/a31b747cfa1b663701c9008f0a4cf0b0516d5d16/infra/config/branch/cq.cfg
,
Nov 12
Awesome, thanks Andrii for helping me through this and holding my hand :). Beneficial for future ANGLE CQ maintenance. Other clients might want to read your guide in step #8. Going to close this out since my work is done but might be worth referring to this issue in follow ups for other projects.
,
Nov 12
The following revision refers to this bug: https://chromium.googlesource.com/angle/angle/+/08c5a8817ce5b5ef8dcfb366564f095f150d9e59 commit 08c5a8817ce5b5ef8dcfb366564f095f150d9e59 Author: Jamie Madill <jmadill@chromium.org> Date: Mon Nov 12 22:54:14 2018 Finalize this legacy branch. The configs now all live in the master branch. Bug: chromium:833848 Change-Id: I6fad39883c84fb73b22567f1afedd5846668e658 Reviewed-on: https://chromium-review.googlesource.com/c/1330316 Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org> [delete] https://crrev.com/31f4c98a679f288d856096709b3205867991eb67/luci-logdog.cfg [delete] https://crrev.com/31f4c98a679f288d856096709b3205867991eb67/OWNERS [delete] https://crrev.com/31f4c98a679f288d856096709b3205867991eb67/codereview.settings [delete] https://crrev.com/31f4c98a679f288d856096709b3205867991eb67/cr-buildbucket.cfg [delete] https://crrev.com/31f4c98a679f288d856096709b3205867991eb67/luci-scheduler.cfg [delete] https://crrev.com/31f4c98a679f288d856096709b3205867991eb67/project.cfg [delete] https://crrev.com/31f4c98a679f288d856096709b3205867991eb67/luci-milo.cfg [modify] https://crrev.com/08c5a8817ce5b5ef8dcfb366564f095f150d9e59/README.md
,
Nov 12
,
Nov 13
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/16c71b54b1d4a6ebc81d83e0340d755b4e585884 commit 16c71b54b1d4a6ebc81d83e0340d755b4e585884 Author: chromium-autoroll <chromium-autoroll@skia-public.iam.gserviceaccount.com> Date: Tue Nov 13 03:43:00 2018 Roll src/third_party/angle 03d1a5ed6cc8..0b18583285cb (1 commits) https://chromium.googlesource.com/angle/angle.git/+log/03d1a5ed6cc8..0b18583285cb git log 03d1a5ed6cc8..0b18583285cb --date=short --no-merges --format='%ad %ae %s' 2018-11-12 jmadill@chromium.org Copy configs from infra/config branch. Created with: gclient setdep -r src/third_party/angle@0b18583285cb The AutoRoll server is located here: https://autoroll.skia.org/r/angle-chromium-autoroll Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md If the roll is causing failures, please contact the current sheriff, who should be CC'd on the roll, and stop the roller if necessary. CQ_INCLUDE_TRYBOTS=luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel BUG= chromium:833848 TBR=cwallez@chromium.org Change-Id: If678095e9fb2bd2ece9d49695a4abe5e0b32dd7c Reviewed-on: https://chromium-review.googlesource.com/c/1332349 Reviewed-by: chromium-autoroll <chromium-autoroll@skia-public.iam.gserviceaccount.com> Commit-Queue: chromium-autoroll <chromium-autoroll@skia-public.iam.gserviceaccount.com> Cr-Commit-Position: refs/heads/master@{#607477} [modify] https://crrev.com/16c71b54b1d4a6ebc81d83e0340d755b4e585884/DEPS
,
Nov 13
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/9e449edb49bf9919fae21c11caf53926753e85d0 commit 9e449edb49bf9919fae21c11caf53926753e85d0 Author: chromium-autoroll <chromium-autoroll@skia-public.iam.gserviceaccount.com> Date: Tue Nov 13 05:42:28 2018 Roll src/third_party/angle 0b18583285cb..cd47a379f960 (5 commits) https://chromium.googlesource.com/angle/angle.git/+log/0b18583285cb..cd47a379f960 git log 0b18583285cb..cd47a379f960 --date=short --no-merges --format='%ad %ae %s' 2018-11-13 jie.a.chen@intel.com Add SH_INIT_SHARED_VARIABLES flag 2018-11-12 timvp@google.com Fix failing dEQP EGL tests. 2018-11-12 jmadill@chromium.org Whitespace change to cq.cfg. 2018-11-12 jmadill@chromium.org Add missing refs.cfg. 2018-11-12 jmadill@chromium.org Whitespace change to cq.cfg. Created with: gclient setdep -r src/third_party/angle@cd47a379f960 The AutoRoll server is located here: https://autoroll.skia.org/r/angle-chromium-autoroll Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md If the roll is causing failures, please contact the current sheriff, who should be CC'd on the roll, and stop the roller if necessary. CQ_INCLUDE_TRYBOTS=luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel BUG=chromium:898030, chromium:833848 , chromium:833848 , chromium:833848 TBR=cwallez@chromium.org Change-Id: I5b67d20c08fdeb6614bca9c7e0f451988f836d27 Reviewed-on: https://chromium-review.googlesource.com/c/1333054 Reviewed-by: chromium-autoroll <chromium-autoroll@skia-public.iam.gserviceaccount.com> Commit-Queue: chromium-autoroll <chromium-autoroll@skia-public.iam.gserviceaccount.com> Cr-Commit-Position: refs/heads/master@{#607502} [modify] https://crrev.com/9e449edb49bf9919fae21c11caf53926753e85d0/DEPS
,
Nov 13
Cool! Since this bug is now about angle, would you mind filing a new bug with the original text again and marking it blocked on this one? (Might've been cleaner to file a new issue for angle and marking this one blocked on that one, but too late for that :-P)
,
Nov 13
|
|||||||||||||
►
Sign in to add a comment |
|||||||||||||
Comment 1 by thakis@chromium.org
, Apr 17 2018