Commit Graph

2152 Commits

Author SHA1 Message Date
Dale Curtis
86213e6795 Fix path for upcoming Autotest relocation.
Additional change for the relocation of Autotest from /home/autotest to /usr/local/autotest. See http://codereview.chromium.org/6090004/

Change-Id: Id6f7ac6e93124414b0b6c6bed48efccfd982a49d

BUG=chromium-os:10799
TEST=Will test as whole with rest of /usr/local changes.

Review URL: http://codereview.chromium.org/5972012
2011-01-10 11:50:01 -08:00
Chris Sosa
f58bc389d9 Create package keywords directory if it doesn't exist.
Clobbering the builder uncovered a bug that was lurking.

Change-Id: Ieb487d2112a7048438943aa96fba23e9c8412a13

BUG=chromium-os:8693
TEST=Running now

Review URL: http://codereview.chromium.org/6050004
2011-01-10 10:58:58 -08:00
Chris Sosa
efbce1e261 Add simple update test to pfq.
This CL also fixes the outstanding issue where to won't report progress in
image_to_live on updates.

Change-Id: I1efaf17f0fd5ebb367ae0872377b4d5d0bf5dbf6

BUG=chromium-os:8680,chromium-os:8901
TEST=Ran it with --debug on the x86 pfq locally.

Review URL: http://codereview.chromium.org/6135002
2011-01-10 09:56:34 -08:00
Scott Zawalski
53f189e92f Update gsutil path as it has changed 2011-01-06 00:44:36 -08:00
J. Richard Barnette
e7205e84be Revert "Major cleanup of cros_au_test_harness code."
This reverts commit 2b2d7a1426.

The internal x86 buildbots have been reporting failures from
cros_au_test_harness with every build, starting with the build
that included the change being reverted.

BUG=chromium-os:8901
TEST=None

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

Change-Id: Iac8c0a13d659f927b3ff61a9a894c10191432e2d
2011-01-05 18:38:49 -08:00
Scott Zawalski
a25cede07d Merge branch 'master' of ssh://gitrw.chromium.org:9222/crosutils 2011-01-05 17:40:10 -08:00
Chris Sosa
2b2d7a1426 Major cleanup of cros_au_test_harness code.
This cleanup code consolidates parsing of options, removes
globals, cleans up private vs. public functions, removes the backup full update option, and cleans up
docstrings.

Change-Id: I3eba26b3634fd87f4a36f195ab42ec7bd11e963f

BUG=chromium-os:8901
TEST=Ran with prefix SimpleTest and ran whole suite for a vm using my latest built image.  Also ran normal update test using latest image against latest dev channel image for mario

Review URL: http://codereview.chromium.org/6015013
2011-01-04 18:05:59 -08:00
Zdenek Behan
75805716f5 enter_chroot: copy over ssh configuration
TEST=clean (first) enter_chroot.sh; repo sync

The developer instructions for setting up chroot include steps to set up
~/.ssh/config to correctly set up ports and options. And while several
attempts are made in enter_chroot to forward ssh-agent and ssh
authentication to chroot as well, the ssh config stays outside of
chroot, which prevents all attempts to contact the git servers if rw URL
is used.

This makes a copy of config on entering the chroot, allowing people to
use repo from within the chroot. That is not bulletproof and does not
reflect changes of config while inside the chroot, but that should be a
borderline case.

Change-Id: I1fcbf00c413c7af8ef14fc1e846192ac95de106d

BUG=n0ne

Review URL: http://codereview.chromium.org/6065011
2011-01-05 00:56:32 +01:00
David James
3f898563fb Prebuilts should not gate normal builds if the server responds with an error.
Recently the tegra2 prebuilts were uploaded with an internal only address and caused external builds to fail.

If a user cannot get the Packages file their build should continue as normal as if the server responded without a packages file in general.

BUG=chromium-os:9917
TEST=Set PORTAGE_BINHOST to invalid value and run build.

Change-Id: I95cab67da7a539afe8c48c831788eca29cc5dc69

Review URL: http://codereview.chromium.org/6085001
2011-01-04 15:36:47 -08:00
David James
8ce81f32dc Update parallel_emerge to experimentally support Portage 2.1.9.
Portage 2.1.9 changes a few APIs, so parallel_emerge needs to change with it.
With this patch, parallel_emerge basically seems to work with Portage 2.1.9.

Note #1: All of our patches against Portage 2.1.7 will need to be forward
ported to Portage 2.1.9 before we'll have complete support for it. See
http://codereview.chromium.org/6093002/ for that.

Note #2: This includes http://codereview.chromium.org/6055004/ . That patch
can be submitted separately, though, and that'll make this patch smaller.

BUG=chromium-os:10574
TEST=Ran ./build_packages  --board=x86-generic --oldchromebinary with and without new portage.
It completes successfully in both cases.

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

Change-Id: I0f851b040e266d98933962b4ccc1c85f7851c8ad
2011-01-04 15:33:53 -08:00
David James
999e09f5c4 Fix bug 10466: parallel_emerge use flag calculation favors local binhost.
When we merge a package, we need to keep track of the use flags associated with
the package, so that we don't merge a package with the wrong use flags.

In some cases, there might be two copies of the same binary package: One local
copy, and one remote copy. Our current logic for grabbing the use flags favors
the local copy. But Portage itself favors the remote copy. To reconcile this
difference, we just reuse the logic from Portage here.

BUG=chromium-os:10466
TEST=
  1. Run build_packages with a correct binhost
  2. Switch to a binhost with different use flags for some of the packages, but the same version number and package name.
  3. Run EXTRA_BOARD_FLAGS=--emptytree build_packages
  4. Run build_image

Also test #3 with --oldchromebinary.

Change-Id: I9b917d8b8d902e0581d5a5d23ad20940930b114a

Review URL: http://codereview.chromium.org/6055004
2011-01-04 15:15:02 -08:00
Scott Zawalski
3dfb64fd55 Merge branch 'master' of ssh://gitrw.chromium.org:9222/crosutils 2011-01-04 13:21:33 -08:00
Chris Sosa
50744ba57c Remove try/catch so that ctest blocks builds.
All blocking reasons for au test harness flakiness have been resolved.  Removing try/catch from ctest so that we propagate the correct error code upon exit.

Change-Id: Iee1f09ade37ac7a590c2dbf4ebb96985818f1882

BUG=chromium-os:10434
TEST=Ran ctest unittests.

Review URL: http://codereview.chromium.org/5971009
2011-01-04 12:17:17 -08:00
Chris Sosa
70311cdfdd Change logic to auto-rev for latest_release and sticky branch.
Also some cleanup and fixing so we don't create unnecessary ebuilds.
I noticed that both the latest release and stable release code
were trying to rev the same branch whenever we moved to a new stable
version.  It was harmless before but now that we're pushing this as
stable we want exactly to have the minimum number of revs that are
correct

Change-Id: I9f834d35be8e85c27ab0505ec81637f9a3c27b88

BUG=
TEST=Unittests and mocked in my own directory by creating new stable
branch.

Review URL: http://codereview.chromium.org/6025012
2010-12-29 15:23:15 -08:00
Nick Sanders
607c0780c0 Allow disk image target for copy machine.
BUG=10531
TEST=build and imaged a mario

Change-Id: I60790f178159d707f610ba1668c29179a6c32e61

Review URL: http://codereview.chromium.org/6050006
2010-12-28 22:27:11 -08:00
Chris Sosa
b1d17e24eb Move git config till after we sync.
This deals with the condition where on a clobber we don't actually
re-config to use ssh:// until the second run (because git config is
called before we first sync the code).

Change-Id: Icf1a46aced633b570db9d280b10ae6866af04709

BUG=chromium-os:10545
TEST=Unit tests

Review URL: http://codereview.chromium.org/6027006
2010-12-22 14:10:10 -08:00
Olof Johansson
5a46bfb321 update_kernel: add support for modules and firmware
Change-Id: I7b38b5f9656bd21f6c88c5385c1aa0c526f48294
Signed-off-by: Olof Johansson <olofj@chromium.org>

BUG=n0ne
TEST=build kernel and firmware, update a mario

Review URL: http://codereview.chromium.org/5974003
2010-12-22 12:14:21 -08:00
Chris Sosa
4e32890c9b Add new script to stop a kvm using vm library and use in harness.
Change-Id: Ie80843a7b81a37b41ae19fc33244b5c0b8152282

BUG=chromium-os:10434
TEST=Ran it with full au test harness (still running but already showing promise).

Review URL: http://codereview.chromium.org/5988006
2010-12-21 14:56:32 -08:00
Don Garrett
c6c925d8ef image_to_live verifies root_dev changed.
Without this, image_to_live can sometimes think that an update from the same version to same version worked when it failed.

BUG=chromium-os:9002
TEST=By hand (hardware && success only)

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

Change-Id: Ic0835372a45a45785e21ba1527d478f447bcf42a
2010-12-21 13:41:57 -08:00
Daniel Erat
e82f07c262 crosutils: Exclude Xvfb and Xnest from images.
These are used to run virtual or nested X servers, which we
don't do.  Removing the binaries saves 3.4 MB.

Change-Id: I528231a781f8a7a0202ca109f8064c3b11ff172b

BUG=chromium-os:8073
TEST=built an image and checked that the files were gone

Review URL: http://codereview.chromium.org/5990003
2010-12-21 13:39:22 -08:00
David James
892e6d8f3c Fix failing unit test for cros_mark_as_stable.
Change-Id: I683cdbec489395bbce53ae4d4ba45ec3538c2aac

BUG=chromium-os:8693
TEST=Run unit tests.

Review URL: http://codereview.chromium.org/6089002
2010-12-21 12:50:21 -08:00
David James
702f0e31ca Be more selective about what packages we remove so that we can detect conflicts.
Right now, the preflight queue unmerges all changed packages prior to
upgrading them. This is done to ensure that any lingering state from
failed package uprevs is cleaned up.

This change updates cros_mark_as_stable to be more selective. This both improves
speed and allows for more conflicts to be detected.

Change-Id: I3134918eb16b41e8882c8af1f1bdf9052bafd9ad

BUG=chromium-os:10127
TEST=Test uprev. Run unit tests.

Review URL: http://codereview.chromium.org/5513012
2010-12-21 12:46:46 -08:00
Chris Sosa
6b69ba7121 Always run build_packages regardless of sync for chrome builder.
Change-Id: If08f3a0c1212e3e7d4ae8dc9f8aa92e2454d4d74

BUG=chromium-os:8693
TEST=Ran it

Review URL: http://codereview.chromium.org/6016005
2010-12-20 11:40:29 -08:00
David James
fa98729856 parallel_emerge now uninstalls packages correctly when use flags change.
When I added the --force-remote-binary flag, I needed to find a way to
get emerge to install binary packages whose use flags were not fully up
to date. To do this, I removed the --newuse flag from the call to the
emerge depgraph calculation code. This seemed safe at the time because
parallel_emerge already checks the use flags of every package it
installs. Unfortunately, things are a little more complex. Sometimes,
emerge decides to install a different version of a package because of a
use flag change. To implement this, Portage needs to know about the
--newuse flag.

To fix this bug, I've updated parallel_emerge to force in the remote
binary packages using a less intrusive method, that only impacts the
package that is being forced. This method should have less side effects
and allow us to install packages correctly.

TEST=./setup_board --board=tegra2_dev-board --force &&
     ./parallel_emerge --board=tegra2_dev-board -uDNvg opengles &&
     ./parallel_emerge --board=tegra2_dev-board -puDNvg board-devices
     ./parallel_emerge --board=tegra2_dev-board -uDNvg chromeos
--force-remote-binary=chromeos-chrome
BUG=chromium-os:10423

Change-Id: I2057d2992abcb08f184cfaa6c099bd6eb8c21a99

Review URL: http://codereview.chromium.org/6033001
2010-12-18 07:18:33 -08:00
Daniel Erat
3a13f91195 scripts: Update factory mod diff for boot-complete job.
I'm changing the boot-complete init script to start on
login-prompt-visible instead of login-prompt-ready in
http://codereview.chromium.org/5868004/.

This also adds a missing description and fixes an outdated
email address.

BUG=chromium-os:10349
TEST=ran mod_image_for_test.sh with --factory and with --factory_install and checked that resulting image contained boot-complete.conf change

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

Change-Id: I709bc2b4eaaccd222b31388633522c32514206ac
2010-12-17 16:36:02 -08:00
Chris Sosa
40fa0ded27 Fixes to get ctest up and running again.
We had a major issue because the latest dev channel release pre-dates the virtio change.  Because of this, ctest was connecting to update that channel using virtio (which is unsupported for that).  This change drops a file telling the vm lib to use e1000 as before.

Also, fixed stateful change logic.

Change-Id: I394a8cece71bdd0d55efa21ba5b6d24804432c6b

BUG=chromium-os:10434
TEST=Ran it with ctest and cros_au_test_harness on images with/without the file.

Review URL: http://codereview.chromium.org/5928005
2010-12-17 13:15:05 -08:00
Chris Sosa
d523d23f2e Remove explicit call to build Chrome.
Since the package.keywords change, it's already built as part of build_packages.
With this change we don't have to needlessly build chrome twice as part of the
pfq.

Change-Id: I8dae745496a5d6f6213663b034ffe8d279d4efd3

BUG=chromium-os:8693
TEST=Ran unittests

Review URL: http://codereview.chromium.org/5973003
2010-12-17 12:35:34 -08:00
David Rochberg
b4f6b3c6a1 Make restart_in_chroot_if_needed run against scripts that are symlinks
This reverts the main change of
84e72fab23

and undoes the breakage of scripts that are symlinks to
...chromeos/scripts..., but at the cost of re-breaking scripts under
scripts/bin.  The correct fix is a combination of removing all the
symlinks to ...chromeos/scripts... and a more robust way of finding
the chroot path of the executable.  But that will have to wait until
someone else does it next week or I return from vacation

TEST=Ran all of these outside chroot.  None seemed more broken than when run in the chroot.  /setup_board  --board=x86-generic, ./cros_workon list --all --board=x86-mario, ./start_devserver , ./build_image --help, ./build_packages --help, ./cros_upgrade_chroot --help, ./enter_chroot.sh , ./customize_rootfs --help, ./run_remote_tests.sh , ./verify_rootfs_chksum.sh , ./set_shared_user_password.sh
BUG=n0ne

Change-Id: Ic2b7484e53e6a977ed6ae675fe99e109b385020d

Review URL: http://codereview.chromium.org/5946003
2010-12-17 11:55:40 -05:00
Chris Sosa
e516dae950 Simplify and clearify push logic.
Change-Id: I5366fb930ca76f596f49d0312228aa5beeccbc31

BUG=chromium-os:8693
TEST=Ran it with and without dryrun and chrome uprev.

Review URL: http://codereview.chromium.org/5846005
2010-12-16 20:01:58 -08:00
Chris Sosa
78bc7d7415 Fix regression introduced by proxy port.
Change-Id: I42a6110d41e79bb0ad50817e2e76b06f7973f6c2

BUG=chromium-os:10434
TEST=Ran it with --test_prefix for delay payload test and it succeeded.

Review URL: http://codereview.chromium.org/5877007
2010-12-16 19:37:28 -08:00
Mandeep Singh Baines
ea621903e9 build_kernel_image: enable nmi watchdog
BUG=10425
TEST=Tested before and after.

Change-Id: Ic3e66805945f379a79562338b16845bb5dbd674f
Before: Machine hangs till power-cycle.
After: Machine reboots and we get a crash dump.

Review URL: http://codereview.chromium.org/5893005
2010-12-16 18:27:06 -08:00
Doug Anderson
9362fa85c7 Allow specifying environment variables w/ enter_chroot again.
Examples of how people might be using enter_chroot:

1. ./enter_chroot [chroot_flags]   VAR1=val1 VAR2=val2 -- cmd arg1 arg2
   Set env vars and run cmd w/ args
2. ./enter_chroot [chroot_flags]   VAR1=val1 VAR2=val2
   Set env vars and run shell
3. ./enter_chroot [chroot_flags]   -- cmd arg1 arg2
   Run cmd w/ args
4. ./enter_chroot [chroot_flags]   VAR1=val1 VAR2=val2 cmd arg1 arg2
   Like #1 _if_ args aren't flags (if they are, enter_chroot will claim them)
5. ./enter_chroot [chroot_flags]   cmd arg1 arg2
   Like #3 _if_ args aren't flags (if they are, enter_chroot will claim them)

I also updated the help to indicate that whole-command quoting is no longer
supported.  If you really need whole-command quoting (maybe you want in-
chroot redirection), you'll need to use sh -c like:
  ./enter_chroot.sh -- sh -c "echo \"Save me\" > /tmp/save.txt"

You should avoid single quotes in the command and arguments.  This isn't
a new limitation: it's shflags related.

Change-Id: I0452a8730ac9b8197834edc753b9eece69896135

BUG=chromium-os:7072
TEST=Tried a whole bunch of these commands.

Review URL: http://codereview.chromium.org/5840003
2010-12-16 14:44:12 -08:00
Scott Zawalski
4228f22c97 Change tegra2 binary builder to use board=tegra2_dev-board instead of tegra2.
This aligns the binary builder with the full builder.

BUG=NA
TEST=NA

Review URL: http://codereview.chromium.org/5839004
2010-12-16 13:44:32 -08:00
Scott Zawalski
46fa8be1b3 Change tegra2 binary builder to use tegra2_dev-board as its board
instead of just tegra2.
2010-12-16 13:32:37 -08:00
Scott Zawalski
f5202e2911 Merge branch 'master' of ssh://gitrw.chromium.org:9222/crosutils 2010-12-16 13:25:20 -08:00
Chris Sosa
f19dea58e9 Fix discovering of stable candidate with unstable ebuilds.
Also add some more information output when we detect that there
is nothing to do.

Change-Id: Ia3dcf0d3c276e10d3368d6bd508f3a0d72be79cd

BUG=chromium-os:8693
TEST=Ran it with all 3 paramaters and current overlay.

Review URL: http://codereview.chromium.org/5884004
2010-12-16 12:36:45 -08:00
Chris Sosa
7c3fdc13b0 Push prebuilts by default.
Change-Id: I0d03b037253f299e36c3621ff6e5970e9af2bb11

BUG=chromium-os:10375
TEST=NA

Review URL: http://codereview.chromium.org/5876002
2010-12-15 17:42:44 -08:00
Chris Sosa
d75d3b43c8 Undo all the manifest logic from cbuildbot.
We also print to /dev/stderr directly to avoid flushing issues which have been occassionally given us broken manifests printed out

Change-Id: I97819bbc31142432aa5ef926f99f2c4f90fd50ef

BUG=chromium-os:9714
TEST=Ran cbuildbot through sync

Review URL: http://codereview.chromium.org/5888003
2010-12-15 17:42:07 -08:00
Doug Anderson
9b0127c6f5 Fixed build failure w/ new sudo
Change-Id: I2760e33e1473ce04f7adeda39d0db5725eaa81ae

BUG=chromium-os:7072
TEST=Replaced ./build_packages with bash and ran command; valided env var set right.

Review URL: http://codereview.chromium.org/5930002
2010-12-15 16:51:49 -08:00
Doug Anderson
7361be58e0 Fixed image_to_live so that it will work with the new sudo
This change will not work properly unless the chroot sudo is
updated to handle escaping properly:
  http://codereview.chromium.org/5923001

...and the chroot sudo will break image_to_live unless this
change goes in.  Thus, the two changes are intertwined.

Change-Id: Ib1602ee47178fc5d32c286e9a914111c1140252b

BUG=chromium-os:7072
TEST=Valided that the dev server seemed to be getting proper args.

Review URL: http://codereview.chromium.org/5929001
2010-12-15 16:05:56 -08:00
Doug Anderson
ebe1baa4ba Fixed update_kernel.sh not to put an extra set of quotes w/ enter_chroot.
This change is in preparation for the new sudo, which corrects how
parameters are passed to subcommands.

Change-Id: I34d09d2716fbef137d02748a2934459a8a10d693

BUG=chromium-os:7072
TEST=Ran modified "update_kernel.sh" w/ old sudo and new sudo.

Review URL: http://codereview.chromium.org/5859002
2010-12-15 13:56:09 -08:00
hexxeh
72d0b08d92 Added option to set ChromeOS version name, track and AU/dev server URLs via environment variables
Change-Id: I80914aa49e74edf71914aa93f310104210581ffd

BUG=none
TEST=Ran a x86-generic build and tested from USB drive

Committed: http://chrome-svn/viewvc/chromeos?view=rev&revision=4a0a239

Review URL: http://codereview.chromium.org/5760004
Patch from hexxeh <hexxeh@hexxeh.net>.
2010-12-15 13:17:37 -08:00
Daniel Kurtz
b38b3c81bc run_remote_tests.sh: pass multiple arguments to autoserv
Change-Id: I7f54a0e078d0c7eb70e0a614bbb991cd372dec60

BUG=chromium-os:9841
TEST=
## Test with these 2 scripts
./bin/cros_run_wifi_tests.sh --cell 3 MatFunc --args "test_pat=000*"
## --and--
./run_remote_tests.sh --remote=${DUT} --args="test_pat=000* config_file=wifi_testbed_chromelab server_addr=${SERVER} router_addr=${ROUTER}" MatFunc

Review URL: http://codereview.chromium.org/5821001
2010-12-15 10:31:11 -08:00
Yasuhiro Matsuda
27c473d6c7 Fix the path of chromeos_version.sh in archive_build.sh
Change-Id: I16fd83aef4cfc11245a95af66813f7689386949b

TBR=djmm
BUG=chromium-os:9714, chromium-os:10354
TEST=none

Review URL: http://codereview.chromium.org/5884001
2010-12-15 17:35:54 +09:00
Chris Sosa
cd2196d6c5 Add package.keywords logic to build version of chrome we specify.
Change-Id: I32c17e7353b420d7a895acffab4579c9b861095c

BUG=chromium-os:8693
TEST=Ran it with chrome_rev=tot, latest_release and stable_release

Review URL: http://codereview.chromium.org/5854001
2010-12-14 17:57:02 -08:00
David McMahon
48db5d2068 Moving chromeos_version.sh to chromiumos_overlay.
BUG=chromium-os:9714
TEST=

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

Change-Id: Ib569fe59f4e14551b198568b24014208b5d65647
2010-12-14 16:19:24 -08:00
Don Garrett
fdefe8664b Fix cros_run_vm_update --proxy_port support
BUG=chromium-os:10318
TEST=Manual

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

Change-Id: I26f0cad29e2b36b045883f0e153e8994e6b436cd
2010-12-14 11:09:19 -08:00
Raja Aluri
888e07c9c8 Adding missing test
Change-Id: I1bbb4b0b54632878bcebdf2fac9fcbe105e2d6cd

BUG=None
TEST=Ran build_image with empty directory.

Review URL: http://codereview.chromium.org/5781009
2010-12-14 10:36:34 -08:00
Chris Sosa
97432e7e9e Don't push manifests for chrome pfq.
Change-Id: I252616725936b2c471026d39d06c3fbb2fa1ed65

BUG=chromium-os:8693
TEST=Ran with chrome_rev=tot

Review URL: http://codereview.chromium.org/5744003
2010-12-13 16:20:51 -08:00
Thieu Le
171321f8ff Zero free space on rootfs so it's more compressible for auto-update
BUG=chromium-os:10228
TEST=Build image, install image to Mario, make sure image still boots

Change-Id: Idc3c2a929515d39cb06926611eff37960074889c

Review URL: http://codereview.chromium.org/5704004
2010-12-13 11:37:42 -08:00