Commit Graph

2650 Commits

Author SHA1 Message Date
Scott Zawalski
3309df01c8 Merge branch 'master' of ssh://gitrw.chromium.org:9222/crosutils 2010-11-16 09:14:22 -08:00
Scott Zawalski
ec41e52159 Remove superfluous space 2010-11-16 09:14:10 -08:00
Scott Zawalski
93954efeda Add a RevGitWithRetry method to retry repo sync and git push
Modify repo sync to just sync the repo we are in, this is what preflight
does and is a proven acceptable approach over the complete 'repo sync' approach.

BUG=8987
TEST=Ran retry command over dummy directories to be sure it retries
as expected.
2010-11-16 09:12:01 -08:00
Raja Aluri
2d9f97232f Created branch 0.9.114.B. Update CHROMEOS_VERSION_BRANCH=115
Change-Id: Ic4f7e18815a65fcceb60d4584150abea6164aa30
2010-11-15 22:45:05 -08:00
David James
77f281a75e Move sanity checks for missing directories until after checkout happens.
Preflight clean needs to wait until after the checkout happens before
it asserts that all of our overlays exist.

BUG=chromium-os:9197
TEST=Ran cbuildbot.py with missing chromiumos-overlay dir

Change-Id: If66574f01d1e85741e971919a9fa2da34f85872d

Review URL: http://codereview.chromium.org/5069001
2010-11-15 20:39:00 -08:00
David James
d87170bb7b Fix infinite loop when FindRepoDir argument is a relative path.
This bug doesn't affect production but affects the unit tests.

BUG=chromium-os:9201
TEST=Confirmed this fixes an infinite loop in the unit tests, and that
    cbuildbot.py still works.

Change-Id: I1a56b92d8229110c84cebbe877e55fb99f053212

Review URL: http://codereview.chromium.org/5025002
2010-11-15 18:57:19 -08:00
David James
f7502a6e03 Special-case preflight clean to allow for missing directories.
If there's no directory, I guess things are really, really clean.

BUG=chromium-os:9197
TEST=Ran cros_mark_as_stable.py clean with missing overlay directories.

Change-Id: I3f4811fe01bca56e850f823a973476884292e278

Review URL: http://codereview.chromium.org/4988004
2010-11-15 18:09:10 -08:00
Chris Sosa
4e75efa930 Add option to check version of Chrome on target.
Change-Id: I34e9d64656e04d4f5c477914512219d9b8563b78

BUG=chromium-os:9137
TEST=Ran with both wrong and right versions against a Google Chrome and
Chromium build

Review URL: http://codereview.chromium.org/4942001
2010-11-15 15:12:06 -08:00
Paul Stewart
b94e40293d Add port flag to remote_rsync_from
Ass ${FLAGS_ssh_port} to ssh arguments for rsync

BUG=chromium-os:9187
TEST=Run rsync-related script with port argument

Change-Id: Iefabef230cfff03dcd66ac0c24798bb4b13ce40d

Review URL: http://codereview.chromium.org/4998004
2010-11-15 14:11:49 -08:00
David James
b49c6df754 Add more error checking to preflight queue.
What's new?
  - cros_mark_as_stable now exits with errors if directories are specified
    that don't exist.
  - cbuildbot.py always explicitly specifies overlay directories so
    cros_mark_as_stable can rely on them existing.
  - Package names and paths are now separated with colons instead of
    spaces, so as to allow for us using the same syntax with
    enter_chroot.sh as we use without the same script. (enter_chroot.sh
    mucks with command-lines that contain spaces or quotes.)
  - cbuildbot.py now ensures its build path is a absolute path. This ensures we don't kill the wrong processes, if, for instance, the buildpath is '../..'
  - All buildbots now explicitly specify what overlays they want to rev. Public buildbots only rev public ebuilds and private buildbots now only rev private ebuilds.

BUG=chromium-os:8647
TEST=Ran unit tests. Manually marked packages as stable. Ran cbuildbot.py test run.

Change-Id: I1df6d428973d91329c4f5159e2886889a3ebb7c7

Committed: http://chrome-svn/viewvc/chromeos?view=rev&revision=795bd30

Review URL: http://codereview.chromium.org/4442001
2010-11-15 13:06:42 -08:00
Kris Rambish
43c22803a1 Make removing the last ] more full-proof
Make removal of last ] more full-proof

Change-Id: I002e5ed513066a214fd6353f66e05bf5458f6ad4

BUG=7115
TEST= No file, with --subfolder
  No file, without --subfolder
  Empty file
  File with one config already in it, with --subfolder
  File with one config and garbage at the end, with --subfolder
  File with one config and newlines at the end, with --subfolder
  File with one config, without subfolder

Review URL: http://codereview.chromium.org/4688004
2010-11-15 11:26:22 -08:00
Scott Zawalski
f057702603 Merge branch 'master' of ssh://gitrw.chromium.org:9222/crosutils 2010-11-15 09:44:13 -08:00
David McMahon
37f4222632 Stop using CHROME_BUILD altogether - companion change coming in crostools.
BUG=
TEST=

Review URL: http://codereview.chromium.org/4917001
2010-11-12 16:17:59 -08:00
Don Garrett
132ff4320d cros_generate_upload_payload --patch_kernel should mount from the source
image read only to avoid unintended changes.

Change-Id: Id3a83786f2c1240a4401978c8cacffc0dcb9d66f

BUG=9073
TEST=Ran script with --patch_kernel, verified source image unmodified.
Ran ./image_to_live.sh to verify valid update was generated.

Review URL: http://codereview.chromium.org/4892002
2010-11-12 15:29:30 -08:00
Chris Sosa
5a886ff53d Don't allow hardlinks in tarball.
These errors on extraction if you don't have the original targets
of the links on the image (i.e. if the stateful_partition gets wiped).

Change-Id: Id5d3f770830de6165613d506733c04edefccd3fb

BUG=chromium-os:9103
TEST=Ran update, wiped partition, ran stateful_update and ran bvt's.

Review URL: http://codereview.chromium.org/4882006
2010-11-12 15:20:27 -08:00
David James
02b3e4f3d5 Revert "Add more error checking to preflight queue."
This reverts commit 795bd30f06.

BUG=
TEST=

Review URL: http://codereview.chromium.org/4904003

Change-Id: I9148026ecd0df75c253cfcf0c67af3d26771dd21
2010-11-12 14:47:57 -08:00
David James
795bd30f06 Add more error checking to preflight queue.
What's new?
  - cros_mark_as_stable now exits with errors if directories are specified
    that don't exist.
  - cbuildbot.py always explicitly specifies overlay directories so
    cros_mark_as_stable can rely on them existing.
  - Package names and paths are now separated with colons instead of
    spaces, so as to allow for us using the same syntax with
    enter_chroot.sh as we use without the same script. (enter_chroot.sh
    mucks with command-lines that contain spaces or quotes.)
  - cbuildbot.py now ensures its build path is a absolute path. This ensures we don't kill the wrong processes, if, for instance, the buildpath is '../..'
  - All buildbots now explicitly specify what overlays they want to rev. Public buildbots only rev public ebuilds and private buildbots now only rev private ebuilds.

BUG=chromium-os:8647
TEST=Ran unit tests. Manually marked packages as stable. Ran cbuildbot.py test run.

Change-Id: I1df6d428973d91329c4f5159e2886889a3ebb7c7

Review URL: http://codereview.chromium.org/4442001
2010-11-12 14:33:14 -08:00
Hung-Te Lin
bcc60b625d crosutils: move image_common.sh to lib/cros_image_common.sh
The team is moving utility/library scripts into 'lib' folder.
image_common.sh should follow this policy.

Also refined the parameter check of mk_memento_images.sh

BUG=chromium-os:5208
TEST=./make_factory_package.sh --factory PATH_TO_FACTORY --release PATH_TO_RELEASE;
     # factory bundle created successfully
     ./mk_memento_images.sh PATH_TO_PART2 PATH_TO_PART3
     # update.gz created successfully
     ./mk_memento_images.sh PATH_TO_IMGE 2 3
     # update.gz created successfully

Change-Id: I3afecf05da2832986723f28b595045d0540ea9e9

Review URL: http://codereview.chromium.org/4825004
2010-11-13 05:36:20 +08:00
Chris Sosa
c60e567799 Convert rootfs and stateful mountpts to absolute paths.
Change-Id: Ib9b6b9ba7787fba337e71e4968a5c152b5a21e14

BUG=chromiumos:8885
TEST=Ran with default options and setting --rootfs_mountpt and stateful_mountpt
to dirs in my current workig directory ... saw cleanup correctly on unmount

Review URL: http://codereview.chromium.org/4853001
2010-11-12 10:54:25 -08:00
Hung-Te Lin
51484a96e9 crosutils: refine memento image / factory package creation
This CL improves creation of memento / factory image payload by:
 - verbose progress report
 - allowing to compress by pigz, the parallel version of gzip
 - prevents unpacking entire image if partition tools (cgpt/parted)
   is available.

BUG=chromium-os:6536,chromium-os:5208
TEST=Verified executing "time ./make_factory_package.sh ..." for ToT factory bundle:
 - before this CL (memento gzip param is not -9): 3m53.126s
 - after this CL, without pigz, with cgpt: 2m34.897s
 - after this CL, with pigz+cgpt, memento_gz=-9: 0m45.603s
 - after this CL, with pigz, without cgpt/parted, memento_gz=-9: 1m49.748s
 Also verified such bundle can be installed on a real netbook device.

Change-Id: Ie182844ea5482d6d321b9549fa584377edf7dfe3

Review URL: http://codereview.chromium.org/4824003
2010-11-13 02:43:14 +08:00
Raja Aluri
4ca4b147e5 Created branch 0.9.112.B. Update CHROMEOS_VERSION_BRANCH=113
Change-Id: Ia23fb80872a902750d113a6bbe65595ffbd6d720
2010-11-11 18:26:41 -08:00
Raja Aluri
d44bcf9a45 Adding a script to generate au-geneate.zip file
Change-Id: Ifc47ed28dc3efc0e7ebd018f6703b36913ffd39c

BUG=8716
TEST=Ran the script inside the chroot to makesure it is generating the package.

Review URL: http://codereview.chromium.org/4425004
2010-11-11 17:46:53 -08:00
David James
4beb5cb58f Revert "Add more error checking to preflight queue."
This reverts commit b4258c8bd4.

BUG=br0ken build
TBR=rspangler
TEST=

Review URL: http://codereview.chromium.org/4697007

Change-Id: I839ffd08d33fc5943696cfe31f2978fe32ce5fec
2010-11-11 10:51:07 -08:00
David James
f9b84d61a1 Define buildroot properly.
Followup to "Add more error checking to preflight queue."
BUG=Br0ken build
TBR=kliegs@chromium.org
TEST=Ran unit tests

Review URL: http://codereview.chromium.org/4742004

Change-Id: I63e52265ae404f0193cb1f9ab35f3f1ec266d2c1
2010-11-11 10:45:12 -08:00
David James
b4258c8bd4 Add more error checking to preflight queue.
What's new?
  - cros_mark_as_stable now exits with errors if directories are specified
    that don't exist.
  - cbuildbot.py always explicitly specifies overlay directories so
    cros_mark_as_stable can rely on them existing.
  - Package names and paths are now separated with colons instead of
    spaces, so as to allow for us using the same syntax with
    enter_chroot.sh as we use without the same script. (enter_chroot.sh
    mucks with command-lines that contain spaces or quotes.)
  - All buildbots now explicitly specify what overlays they want to rev. Public buildbots only rev public ebuilds and private buildbots now only rev private ebuilds.

BUG=chromium-os:8647
TEST=Ran unit tests. Manually marked packages as stable.

Change-Id: I1df6d428973d91329c4f5159e2886889a3ebb7c7

Review URL: http://codereview.chromium.org/4442001
2010-11-11 10:37:04 -08:00
Chris Sosa
9a40915f00 Add new stateful upload payload generator to crosutils.
Change-Id: I53a24d6188711a248a1dc7c869aa9258b10970d2

BUG=chromium-os:8885
TEST=Ran by itself with latest image and current directory as my
output dir as well as with new dev server changes.

Review URL: http://codereview.chromium.org/4688006
2010-11-10 17:31:51 -08:00
Ken Mixter
5bedbc9ad7 crosutils: Require cros_show_stacks to run inside chroot
Change-Id: I28e01fb8ddb542eddf3750def7d49cd40822d6d9

BUG=9026
TEST=Try outside chroot

Review URL: http://codereview.chromium.org/4782003
2010-11-10 16:42:43 -08:00
Chris Masone
f8513d84fe [crosutils] Propagate use_emerged flag up from run_remote_tests
BUG=8544
TEST=build chrome with build_tests, cros_workon start autotest, and then run desktopui_BrowserTest with cros_run_parallel_vm_tests

Change-Id: I19e181238fd75450d41f6debb3a8f7d0c17d15dc

Review URL: http://codereview.chromium.org/4669007
2010-11-09 14:23:29 -08:00
Chris Masone
d11ce17167 [crosutils] Mask out /usr/local/autotest-pkgs on install
BUG=8544
TEST=build image with --factory_install, ensure that image does not have data in /usr/local/autotest-pkgs

Change-Id: I5ed17d794392ec654bc122fa15f7ab8a7abbba2d

Review URL: http://codereview.chromium.org/4756001
2010-11-09 14:22:08 -08:00
Chris Masone
7d04c7aacb [crosutils] bump default size of VM disk to allow for bigger stateful partition
BUG=8544
TEST=create an VM image with image_to_vm.sh; the stateful partition should be 2GB in size.

Change-Id: I6c0ee9e2cb513e42c25e4f0d1616835a41f378d7

Review URL: http://codereview.chromium.org/4737001
2010-11-09 08:24:13 -08:00
J. Richard Barnette
4800e04fe8 Try and get the internal buildbot smoke tests to pass
BUG=chromium-os:8910
TEST=None

Review URL: http://codereview.chromium.org/4683007

Change-Id: I3ff1ccdd038255d8c3594f853ced614ccafc2af3
2010-11-08 19:29:26 -08:00
Ken Mixter
08145697a5 crosutils: Add vnc view of tests running multiple tests for VM tests
Change-Id: I87c41e60797848192cee1f0c165215fcec8f5bd2

BUG=8850
TEST=Ran a few tests including suite_Smoke

Review URL: http://codereview.chromium.org/4647001
2010-11-08 18:10:08 -08:00
Doug Anderson
ec5d7f0d2d Code cleanup: comments, docstrings, and gpylint fixes.
Most of this is from this code review:
  http://codereview.chromium.org/4175007/diff/1/2

I also ran the code through gpylint and fixed some of the stuff,
like making quoting consistent.

Change-Id: Icb3896dbd4e975c7ea4687d58efd6372adfcc3c9

BUG=chromium-os:8205
TEST=Ran ./cros_changelog 0.7.48.0 and saw error; also ran ./cros_changelog 0.9.98.3

Review URL: http://codereview.chromium.org/4263001
2010-11-08 14:46:03 -08:00
Ken Mixter
47fd7b5c51 crosutils: Always pass an image to devserver so it can pregenerate
Change-Id: Ib366064df269bd0d4aee30e5b1628938bd8fedf9

BUG=8313
TEST=Running it once without passing an image

Review URL: http://codereview.chromium.org/4208003
2010-11-08 13:35:05 -08:00
Will Drewry
226522a011 build_image: rollback default error behavior until kernel-next merge
kernel-next lacks error mode 3.  Rolling back until merged.

TEST=none: rolling back to old value
BUG=chromium-os:8442

Change-Id: I0c1a89dc3e00fe5f315b3c15c5070209b0fd79d0

Review URL: http://codereview.chromium.org/4512004
2010-11-05 20:20:47 -05:00
J. Richard Barnette
2c002821ac Create bootperf-bin tools for running boot time tests and reporting results
BUG=chromium-os:8655
TEST=run bootperf as described by 'bootperf --help'
TEST=run showbootstats as described by 'showbootstats --help'

Review URL: http://codereview.chromium.org/4148011

Change-Id: Idcfe206f7708fe5290960149952239219d1a96f6
2010-11-05 17:43:04 -07:00
Huyen Nguyen
1330edb593 Fix bug where square bracket is not removed before appending new rule.
Change-Id: I5618b211abd69b4e3774fa6e4009183ef996a8d8

BUG=8815
TEST=run locally

Review URL: http://codereview.chromium.org/4498004
2010-11-05 16:15:46 -07:00
David James
139ad9dca0 Update parallel_emerge to correct use flags, fixing a regression.
BUG=chromium-os:8814
TEST=Verify packages with old use flags are updated, and that binary packages
     with wrong use flags aren't used.

Change-Id: I7064a10796f1541ff9ae36f2ba6ef1d65dbe1aa3

Review URL: http://codereview.chromium.org/4552007
2010-11-05 14:39:02 -07:00
Anush Elangovan
6c4a20ba37 export CHROME_VERSION by default
Change-Id: I788ec487f7c63e71a8a7012c1c7c19c02df103e4

BUG=8786
TEST=eval the script to see it is set right

Review URL: http://codereview.chromium.org/4521003
2010-11-05 11:37:14 -07:00
Ken Mixter
f010d9365f crosutils: Make running tests easier for developers
Add "fast" mode to run_remote_tests which causes the user to no longer need to emerge autotests before running them (even ones that require compilation.)

Change-Id: I60c1e8bfe562a787075b4f65b714e221e51934f7

BUG=8784
TEST=Ran bvts in and out of fast mode, ran UserCrash, SanAngeles, TPM, and backlight tests (which require compilation) in fast mode.

Review URL: http://codereview.chromium.org/4020004
2010-11-05 10:21:08 -07:00
Will Drewry
16106bade8 mod_image_for_recovery: keep the stateful partition around.
Developer images may have data on stateful they want to keep. In that case, just swap the kernels.

BUG=chromium-os:7451
TEST=tested with a --withdev build and stateful was intact and the recovery install worked.

Change-Id: I59d7f2e99892448d1eaf964e6292611accb2035c

Review URL: http://codereview.chromium.org/4418002
2010-11-05 10:10:22 -05:00
David James
6418c50450 Update parallel_emerge to support --force-remote-binary.
This feature is useful if you want to stick to an old binary package of a package you're not working on.

BUG=chromium-os:8769
TEST=./parallel_emerge --board=x86-mario -uDNvg chromeos --force-remote-binary=chromeos-chrome --force-remote-binary=libcros

Change-Id: I7d3011fa64134158ed848f136bc75e09b0af438e

Review URL: http://codereview.chromium.org/4555002
2010-11-04 23:48:52 -07:00
Chris Sosa
170bde0fd4 Fix for bug 8764 that breaks prebuilts for files with more than just keyword pairs.
I've also modified the unit test so it actually tests for this case.

Change-Id: I6688d3be7bf1d8962031fcf1d684ddcaab43ba9f

BUG=8764
TEST=Unittests

Review URL: http://codereview.chromium.org/4566001
2010-11-04 20:49:30 -07:00
Will Drewry
137eab6129 build_image: enable new cros specific error handling in dm-verity
A new error mode for dm-verity exists which can be called as
"cros" or "3".  This change enables that mode in builds by default.

TEST=build_image had the correct argument; functionality was there [in progress]
BUG=chromium-os:8442

Change-Id: I3eb3f4a662c5d36011542af4e50718db50ab63bd

Review URL: http://codereview.chromium.org/4530003
2010-11-04 22:06:41 -05:00
Will Drewry
59752f1667 create_legacy_bootloader_templates.sh: ensure grub escapes quotes
Evidently no one has tested the grub.cfg since verified boot landed. Grub eats
double quotes which breaks verified boot. This changes adds the escapes.  No
other code changes should be needed in build and install code since they
replace DMTABLEA and DMTABLEB and not the quotes.

TEST=nsanders escaped the quotes in his build :); I am doing a new build to ensure the output is escaped now.
BUG=chrome-os-partner:1603

Change-Id: I55e823347c91493caf3b5b2e4577a4e4616df7f0

Review URL: http://codereview.chromium.org/4529002
2010-11-04 21:58:02 -05:00
Chris Sosa
5494da3107 Pass board to devserver for latest image.
Change-Id: I339e1ce3d8f73e15aa554e1111aced163819ec23

BUG=8732
TEST=Ran with other CL and using latest image.

Review URL: http://codereview.chromium.org/4527001
2010-11-04 17:33:46 -07:00
Darin Petkov
4b029a27f8 VM: Use -serial none in no-graphics kvm mode...
...so that the console doesn't get messed up due to the serial port being
redirected from stdin.

BUG=8729
TEST=./bin/cros_run_parallel_vm_tests suite_Smoke suite_Smoke; checked console

Change-Id: I5a0cedba2b0ac7f453b4574666c645e84b30b379

Review URL: http://codereview.chromium.org/4501001
2010-11-04 14:06:57 -07:00
Chris Sosa
de285e0238 Add 0.0.1 logic to new cros_mark.
Change-Id: I413d21dd60ce822af65d5c7c22fd2dba67858d43

BUG=6113
TEST=Ran unit tests and also created my own 9999 ebuild and ran with --all and
saw 0.0.1-r1.ebuild get created in stabilizing_branch

Review URL: http://codereview.chromium.org/4449001
2010-11-04 13:03:33 -07:00
Huyen Nguyen
ca3029e0d2 Run devserver with --factory_config. Add --start_devserver flag.
Change-Id: I9ed0a10033ce608c7ef35465debfc874b55d748c

BUG=7474
TEST=run locally

Review URL: http://codereview.chromium.org/4452001
2010-11-04 12:56:02 -07:00
Huyen Nguyen
41a2b700a2 Fix bug where subfolder is not add to path of firmware.
Change-Id: I5521baa3a2b176167f827034166ffcd443a6a793

BUG=8711
TEST=run locally

Review URL: http://codereview.chromium.org/4413004
2010-11-04 12:40:28 -07:00