New issue
Advanced search Search tips
Note: Color blocks (like or ) mean that a user may not be available. Tooltip shows the reason.

Issue 848020 link

Starred by 2 users

Issue metadata

Status: Fixed
Owner:
Closed: Jun 2018
Cc:
Components:
EstimatedDays: ----
NextAction: ----
OS: ----
Pri: 3
Type: Feature



Sign in to add a comment

Setup PreCQ builders to submit chromeos_config changes.

Project Member Reported by dgarr...@chromium.org, May 30 2018

Issue description

Changes to chromeos_config are frequent, and commonly conflict with each other. Further, they receive minimal testing in the CQ.

We could setup a COMMIT_QUEUE.ini config for them that runs the following builds and then submits the changes from the PreCQ.
  chromite-pre-cq   (for unittests)
  binhost-pre-cq    (for chrome binary prebuilt consistency)

The relevant files are:
  chromeos_config.py
  chromeos_config_unittest.py
  config_dump.json
  waterfall_layout_dump.txt

The only problem is that they would need to be in a directory by themselves for COMMIT_QUEUE.ini, but moving them will be really problematic given the cit cros_pin semantics.

Perhaps we could move them, then create symlinks from the current locations.
 
Labels: -Type-Bug Type-Feature
Status: Available (was: Untriaged)
Cc: bhthompson@chromium.org
Owner: dgarr...@chromium.org
Status: Started (was: Available)
Starting now to see if I can finish as quickly as I think.
Project Member

Comment 5 by bugdroid1@chromium.org, Jun 2 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/chromite/+/9f740f0b2a8860dd9e18d2b9842782f3306100e3

commit 9f740f0b2a8860dd9e18d2b9842782f3306100e3
Author: Don Garrett <dgarrett@google.com>
Date: Sat Jun 02 00:44:13 2018

config_lib: Have tests use config_lib not cbuildbot_config.

We had a bunch of tests importing cbuildbot_config, but by having them
import from config_lib, the import process can be cached, and thus
faster.

This also make it easier to move cbuildbot_config to a new location.

BUG= chromium:848020 
TEST=run_tests

Change-Id: I068448e5d7321a35def2f2e7d14ea62ef655040a
Reviewed-on: https://chromium-review.googlesource.com/1081245
Commit-Ready: Don Garrett <dgarrett@chromium.org>
Tested-by: Don Garrett <dgarrett@chromium.org>
Reviewed-by: Jason Clinton <jclinton@chromium.org>

[modify] https://crrev.com/9f740f0b2a8860dd9e18d2b9842782f3306100e3/cbuildbot/cbuildbot_run_unittest.py
[modify] https://crrev.com/9f740f0b2a8860dd9e18d2b9842782f3306100e3/cbuildbot/relevant_changes_unittest.py
[modify] https://crrev.com/9f740f0b2a8860dd9e18d2b9842782f3306100e3/cbuildbot/stages/build_stages_unittest.py
[modify] https://crrev.com/9f740f0b2a8860dd9e18d2b9842782f3306100e3/cbuildbot/stages/generic_stages_unittest.py
[modify] https://crrev.com/9f740f0b2a8860dd9e18d2b9842782f3306100e3/cbuildbot/stages/sync_stages_unittest.py

Project Member

Comment 6 by bugdroid1@chromium.org, Jun 2 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/chromite/+/cc45e78fe9e580565755cd6a9806bc3c74ab7f59

commit cc45e78fe9e580565755cd6a9806bc3c74ab7f59
Author: Don Garrett <dgarrett@google.com>
Date: Sat Jun 02 00:44:14 2018

config_lib: Remove dead site specific code.

This cleans up a few more bits of dead code, left from the now
obsolete site specific config.

BUG= chromium:848020 
TEST=run_tests

Change-Id: I29eb206cf90423913e502443b293af40f07e8667
Reviewed-on: https://chromium-review.googlesource.com/1081246
Commit-Ready: Don Garrett <dgarrett@chromium.org>
Tested-by: Don Garrett <dgarrett@chromium.org>
Reviewed-by: Jason Clinton <jclinton@chromium.org>

[modify] https://crrev.com/cc45e78fe9e580565755cd6a9806bc3c74ab7f59/lib/constants.py
[modify] https://crrev.com/cc45e78fe9e580565755cd6a9806bc3c74ab7f59/lib/config_lib.py
[modify] https://crrev.com/cc45e78fe9e580565755cd6a9806bc3c74ab7f59/.gitignore

Project Member

Comment 7 by bugdroid1@chromium.org, Jun 2 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/5e30abe6e3c20b2ee8eba0903eb2a0993cfa48ce

commit 5e30abe6e3c20b2ee8eba0903eb2a0993cfa48ce
Author: Chromite Chromium Autoroll <chromite-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Date: Sat Jun 02 02:10:40 2018

Roll src/third_party/chromite d606e64..c4db222 (6 commits)

https://chromium.googlesource.com/chromiumos/chromite.git/+log/d606e64..c4db222


git log d606e64..c4db222 --date=short --no-merges --format='%ad %ae %s'
2018-06-02 tbrindus@chromium.org deploy_chrome: add missing string format in NoChromiumSrcDir exception
2018-06-02 achuith@chromium.org cros_run_vm_test: stream long running commands.
2018-06-02 ayatane@chromium.org infra_stages: Build skylab-inventory
2018-06-02 dgarrett@google.com config_lib: Remove dead site specific code.
2018-06-02 dgarrett@google.com config_lib: Have tests use config_lib not cbuildbot_config.
2018-06-02 mortonm@chromium.org Adjust tester for shill group.


Created with:
  gclient setdep -r src/third_party/chromite@c4db222

The AutoRoll server is located here: https://chromite-chromium-roll.skia.org

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.



BUG= chromium:848437 , chromium:829481 ,chromium:845337, chromium:848020 , chromium:848020 ,chromium:649417
TBR=chrome-os-gardeners@chromium.org

Change-Id: If746ebf051296d3c05ede530501656a4339c8f10
Reviewed-on: https://chromium-review.googlesource.com/1083944
Reviewed-by: Chromite Chromium Autoroll <chromite-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Commit-Queue: Chromite Chromium Autoroll <chromite-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#563915}
[modify] https://crrev.com/5e30abe6e3c20b2ee8eba0903eb2a0993cfa48ce/DEPS

Project Member

Comment 8 by bugdroid1@chromium.org, Jun 5 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/chromite/+/5faf3c6651d6aae374ffe736a32ac5d00d9cdea0

commit 5faf3c6651d6aae374ffe736a32ac5d00d9cdea0
Author: Don Garrett <dgarrett@google.com>
Date: Tue Jun 05 00:23:33 2018

config_stages: Handle multiple config locations.

This is preparation for moving our config files to a new directory,
while leaving them in the old location on older branches.

Adjust the config_updater stages to probe for our build config files,
and operate on them based on the directory in which they are found.

Also, switch to using the chromeos_config_unittest --update to
regenerate dump files instead of using the update scripts directly.

BUG= chromium:848020 
TEST=run_tests

Change-Id: Ie553efb4935d1b390bc9df1ed402335fa4b7de53
Reviewed-on: https://chromium-review.googlesource.com/1081547
Commit-Ready: Don Garrett <dgarrett@chromium.org>
Tested-by: Don Garrett <dgarrett@chromium.org>
Reviewed-by: Jason Clinton <jclinton@chromium.org>
Reviewed-by: Ningning Xia <nxia@chromium.org>

[modify] https://crrev.com/5faf3c6651d6aae374ffe736a32ac5d00d9cdea0/cbuildbot/stages/config_stages_unittest.py
[modify] https://crrev.com/5faf3c6651d6aae374ffe736a32ac5d00d9cdea0/cbuildbot/stages/config_stages.py

Project Member

Comment 9 by bugdroid1@chromium.org, Jun 5 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/7cc6e786d406aea1df1526cbe9c65b4e15afb8a7

commit 7cc6e786d406aea1df1526cbe9c65b4e15afb8a7
Author: Chromite Chromium Autoroll <chromite-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Date: Tue Jun 05 01:55:33 2018

Roll src/third_party/chromite 9665e37..84e4547 (6 commits)

https://chromium.googlesource.com/chromiumos/chromite.git/+log/9665e37..84e4547


git log 9665e37..84e4547 --date=short --no-merges --format='%ad %ae %s'
2018-06-05 dhanyaganesh@google.com 'tar: file changed as we read it' fix
2018-06-05 ayatane@chromium.org chromeos-infra-go-pre-cq: New build config
2018-06-05 dgarrett@google.com config_stages: Handle multiple config locations.
2018-06-05 ahassani@chromium.org paygen: Rename signature variables
2018-06-05 bmgordon@chromium.org cros_sdk: Remove unused toolchain overlay support
2018-06-05 dats@google.com cros-disks: FUSE daemons are not in chronos-access anymore.


Created with:
  gclient setdep -r src/third_party/chromite@84e4547

The AutoRoll server is located here: https://chromite-chromium-roll.skia.org

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.



BUG=chromium:547055,chromium:845337, chromium:848020 , chromium:845614 ,chromium:845174, chromium:841119 
TBR=chrome-os-gardeners@chromium.org

Change-Id: I04ea4de88cd62923087594cce649f787b3b251b4
Reviewed-on: https://chromium-review.googlesource.com/1086328
Reviewed-by: Chromite Chromium Autoroll <chromite-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Commit-Queue: Chromite Chromium Autoroll <chromite-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#564344}
[modify] https://crrev.com/7cc6e786d406aea1df1526cbe9c65b4e15afb8a7/DEPS

Project Member

Comment 10 by bugdroid1@chromium.org, Jun 5 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/chromite/+/5af8bde80d5868251ee33c279ec95e7ad0f2e90b

commit 5af8bde80d5868251ee33c279ec95e7ad0f2e90b
Author: Don Garrett <dgarrett@google.com>
Date: Tue Jun 05 19:07:46 2018

chromeos_config: Move chromeos_config -> chromite/config.

By moving the chromeos_config related files into a distinct directory,
we can use a custom COMMIT_QUEUE.ini for them, which will allow them
to be tested and submitted from the PreCQ.

BUG= chromium:848020 
TEST=run_tests (including json updates)

Change-Id: I4d74b9c1fb8a1d4d09a0e839060d8ac575c4e42b
Reviewed-on: https://chromium-review.googlesource.com/1081548
Reviewed-by: Don Garrett <dgarrett@chromium.org>
Tested-by: Don Garrett <dgarrett@chromium.org>

[rename] https://crrev.com/5af8bde80d5868251ee33c279ec95e7ad0f2e90b/config/chromeos_config.py
[modify] https://crrev.com/5af8bde80d5868251ee33c279ec95e7ad0f2e90b/bin/preupload_dump_config
[rename] https://crrev.com/5af8bde80d5868251ee33c279ec95e7ad0f2e90b/config/waterfall_layout_dump.txt
[rename] https://crrev.com/5af8bde80d5868251ee33c279ec95e7ad0f2e90b/config/config_dump.json
[rename] https://crrev.com/5af8bde80d5868251ee33c279ec95e7ad0f2e90b/config/chromeos_config_unittest.py
[add] https://crrev.com/5af8bde80d5868251ee33c279ec95e7ad0f2e90b/config/__init__.py
[add] https://crrev.com/5af8bde80d5868251ee33c279ec95e7ad0f2e90b/cbuildbot/config_dump.json
[rename] https://crrev.com/5af8bde80d5868251ee33c279ec95e7ad0f2e90b/config/chromeos_config_unittest
[add] https://crrev.com/5af8bde80d5868251ee33c279ec95e7ad0f2e90b/cbuildbot/waterfall_layout_dump.txt
[rename] https://crrev.com/5af8bde80d5868251ee33c279ec95e7ad0f2e90b/config/ge_build_config.json
[modify] https://crrev.com/5af8bde80d5868251ee33c279ec95e7ad0f2e90b/lib/constants.py
[modify] https://crrev.com/5af8bde80d5868251ee33c279ec95e7ad0f2e90b/scripts/cbuildbot_view_config.py

Project Member

Comment 11 by bugdroid1@chromium.org, Jun 5 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/chromite/+/3c46387ea092a0351ad82cd490def3e8644d107f

commit 3c46387ea092a0351ad82cd490def3e8644d107f
Author: Don Garrett <dgarrett@google.com>
Date: Tue Jun 05 19:25:19 2018

config: Submit config changes from PreCQ.

Submit changes to the chromeos_config and it's related files directly
from the PreCQ.

BUG= chromium:848020 
TEST=run_tests

Change-Id: Id0f93194f259e4feb277a55621cca8d22e092255
Reviewed-on: https://chromium-review.googlesource.com/1081549
Tested-by: Don Garrett <dgarrett@chromium.org>
Reviewed-by: Jason Clinton <jclinton@chromium.org>

[modify] https://crrev.com/3c46387ea092a0351ad82cd490def3e8644d107f/COMMIT-QUEUE.ini
[add] https://crrev.com/3c46387ea092a0351ad82cd490def3e8644d107f/config/COMMIT-QUEUE.ini

The changes appear to have broken "cit cros_pin update master". Looking now to see how to resolve that.
Ah.... cit is reading config_dump.json from gitiles, which means a symlink to the new location won't work.
Project Member

Comment 14 by bugdroid1@chromium.org, Jun 6 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/chromite/+/48de7bbc83c2c4730aa33013fc5cb04c95869626

commit 48de7bbc83c2c4730aa33013fc5cb04c95869626
Author: Don Garrett <dgarrett@google.com>
Date: Wed Jun 06 00:16:15 2018

chromeos_config: Remove symlinks to new config files locations.

These symlinks are not useful, since the chops code is fetching the
files via gitiles.

BUG= chromium:848020 
TEST=None

Change-Id: I0c5d4b754ec5ae86c80d1a3bed32df5fba1a3a06
Reviewed-on: https://chromium-review.googlesource.com/1087713
Tested-by: Don Garrett <dgarrett@chromium.org>
Trybot-Ready: Don Garrett <dgarrett@chromium.org>
Reviewed-by: Jason Clinton <jclinton@chromium.org>
Commit-Queue: Don Garrett <dgarrett@chromium.org>

[delete] https://crrev.com/784bb7f874d30d549cbb8ef08d901c949dc9ae5f/cbuildbot/config_dump.json
[delete] https://crrev.com/784bb7f874d30d549cbb8ef08d901c949dc9ae5f/cbuildbot/waterfall_layout_dump.txt

Project Member

Comment 15 by bugdroid1@chromium.org, Jun 6 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/chromite/+/981fb86831b4a40dbd2e6aba33ca4aa31d8cebe3

commit 981fb86831b4a40dbd2e6aba33ca4aa31d8cebe3
Author: Don Garrett <dgarrett@google.com>
Date: Wed Jun 06 00:16:43 2018

config_stages: Fix a missed path that can change per branch.

When moving the config files, there is an additional path that can
change per branch which was not updated.

Also, to simplify things, use the unittests to update the dump files
instead of using explicit logic. This reduces the number of paths
which need to be updated.

BUG= chromium:848020 
TEST=run_tests

Change-Id: I1b53af81aff612fa09c6c41c1b61d2a5e1de3f25
Reviewed-on: https://chromium-review.googlesource.com/1087714
Tested-by: Don Garrett <dgarrett@chromium.org>
Trybot-Ready: Don Garrett <dgarrett@chromium.org>
Reviewed-by: Jason Clinton <jclinton@chromium.org>

[modify] https://crrev.com/981fb86831b4a40dbd2e6aba33ca4aa31d8cebe3/cbuildbot/stages/config_stages_unittest.py
[modify] https://crrev.com/981fb86831b4a40dbd2e6aba33ca4aa31d8cebe3/cbuildbot/stages/config_stages.py

Project Member

Comment 16 by bugdroid1@chromium.org, Jun 6 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/chromite/+/87da90a72bad907485062896d028c5f5559ae135

commit 87da90a72bad907485062896d028c5f5559ae135
Author: Don Garrett <dgarrett@chromium.org>
Date: Wed Jun 06 00:30:28 2018

Revert "config_stages: Fix a missed path that can change per branch."

This reverts commit 981fb86831b4a40dbd2e6aba33ca4aa31d8cebe3.

Reason for revert: I THOUGHT I'd checked the tryjob verifying this, but had not. This change is bad.

https://cros-goldeneye.corp.google.com/chromeos/healthmonitoring/buildDetails?buildbucketId=8944514920481493392

Original change's description:
> config_stages: Fix a missed path that can change per branch.
> 
> When moving the config files, there is an additional path that can
> change per branch which was not updated.
> 
> Also, to simplify things, use the unittests to update the dump files
> instead of using explicit logic. This reduces the number of paths
> which need to be updated.
> 
> BUG= chromium:848020 
> TEST=run_tests
> 
> Change-Id: I1b53af81aff612fa09c6c41c1b61d2a5e1de3f25
> Reviewed-on: https://chromium-review.googlesource.com/1087714
> Tested-by: Don Garrett <dgarrett@chromium.org>
> Trybot-Ready: Don Garrett <dgarrett@chromium.org>
> Reviewed-by: Jason Clinton <jclinton@chromium.org>

Bug:  chromium:848020 
Change-Id: Ida993ea0fc95c531cf9ccb93e4db8d6d47e255a5
Reviewed-on: https://chromium-review.googlesource.com/1088166
Reviewed-by: Don Garrett <dgarrett@chromium.org>
Tested-by: Don Garrett <dgarrett@chromium.org>

[modify] https://crrev.com/87da90a72bad907485062896d028c5f5559ae135/cbuildbot/stages/config_stages_unittest.py
[modify] https://crrev.com/87da90a72bad907485062896d028c5f5559ae135/cbuildbot/stages/config_stages.py

Project Member

Comment 17 by bugdroid1@chromium.org, Jun 6 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/e58666870795fa4aaffb110c0d9c2902296bdcec

commit e58666870795fa4aaffb110c0d9c2902296bdcec
Author: Chromite Chromium Autoroll <chromite-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Date: Wed Jun 06 03:39:59 2018

Roll src/third_party/chromite 784bb7f..87da90a (3 commits)

https://chromium.googlesource.com/chromiumos/chromite.git/+log/784bb7f..87da90a


git log 784bb7f..87da90a --date=short --no-merges --format='%ad %ae %s'
2018-06-06 dgarrett@chromium.org Revert "config_stages: Fix a missed path that can change per branch."
2018-06-06 dgarrett@google.com config_stages: Fix a missed path that can change per branch.
2018-06-06 dgarrett@google.com chromeos_config: Remove symlinks to new config files locations.


Created with:
  gclient setdep -r src/third_party/chromite@87da90a

The AutoRoll server is located here: https://chromite-chromium-roll.skia.org

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.



BUG= chromium:848020 , chromium:848020 , chromium:848020 
TBR=chrome-os-gardeners@chromium.org

Change-Id: Ib07fa234212c937752540d95695c1ce12f57f5cc
Reviewed-on: https://chromium-review.googlesource.com/1088246
Reviewed-by: Chromite Chromium Autoroll <chromite-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Commit-Queue: Chromite Chromium Autoroll <chromite-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#564782}
[modify] https://crrev.com/e58666870795fa4aaffb110c0d9c2902296bdcec/DEPS

Project Member

Comment 18 by bugdroid1@chromium.org, Jun 6 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/tools/build/+/93ea601376a68d413c0023da5e5a25951cf9ad06

commit 93ea601376a68d413c0023da5e5a25951cf9ad06
Author: Don Garrett <dgarrett@google.com>
Date: Wed Jun 06 23:55:43 2018

cit cros_pin: Update to handle either chromeos config path.

The ChromeOS config files are moving to a new location, but will still
exist in the old location on old branches. This change modifies the
cros_pin command to probe the new/old locations before reading in the
chromeos configuration.

BUG= chromium:848020 

Change-Id: Ifab0d38f585a9b4ce9f03d3beb29574db15b6b7d
Reviewed-on: https://chromium-review.googlesource.com/1087771
Commit-Queue: Don Garrett <dgarrett@chromium.org>
Reviewed-by: Ryan Tseng <hinoka@chromium.org>

[modify] https://crrev.com/93ea601376a68d413c0023da5e5a25951cf9ad06/scripts/common/unittests/cros_chromite_test.py
[modify] https://crrev.com/93ea601376a68d413c0023da5e5a25951cf9ad06/scripts/common/cros_chromite.py

Project Member

Comment 19 by bugdroid1@chromium.org, Jun 9 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/chromite/+/8c44b9157151c539d00a341857f04c6714492b49

commit 8c44b9157151c539d00a341857f04c6714492b49
Author: Don Garrett <dgarrett@google.com>
Date: Sat Jun 09 09:19:23 2018

config_stages: Fix a missed path that can change per branch.

When moving the config files, there is an additional path that can
change per branch which was not updated.

Also, to simplify things, use the unittests to update the dump files
instead of using explicit logic. This reduces the number of paths
which need to be updated.

Originally committed as CL:1087714, reverted because of problems,
corrected and re-uploaded.

BUG= chromium:848020 
TEST=run_tests + config-updater-tryjob.

Change-Id: I4e9cd895de0671313000f2477116b46bd9790329
Reviewed-on: https://chromium-review.googlesource.com/1088159
Commit-Ready: Don Garrett <dgarrett@chromium.org>
Tested-by: Don Garrett <dgarrett@chromium.org>
Reviewed-by: Don Garrett <dgarrett@chromium.org>

[modify] https://crrev.com/8c44b9157151c539d00a341857f04c6714492b49/cbuildbot/stages/config_stages_unittest.py
[modify] https://crrev.com/8c44b9157151c539d00a341857f04c6714492b49/cbuildbot/stages/config_stages.py

Status: Fixed (was: Started)

Sign in to add a comment