Improvements for to continuous test loop.

src/scripts/sync_build_test.sh

 #!/bin/bash
 
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Script to sync your checkout, build a Chromium OS image, and test it all
 # with one command.  Can also check out a new Chromium OS checkout and
 # perform a subset of the above operations.
 #
@@ skipping 182 matching lines @@
   local set_passwd=${FLAGS_FALSE}
   if [[ ${FLAGS_build} -eq ${FLAGS_true} ]]; then
     echo " * Build image (build_platform_packages.sh, build_kernel.sh)"
     set_passwd=${FLAGS_TRUE}
   fi
   if [[ ${FLAGS_master} -eq ${FLAGS_true} ]]; then
     echo " * Master image (build_image.sh)"
   fi
   if [[ -n "${FLAGS_grab_buildbot}" ]]; then
     if [[ "${FLAGS_grab_buildbot}" == "LATEST" ]]; then
-      echo " * Grabbing latest buildbot image under ${FLAGS_buildbot_uri}"
+      echo " * Grab latest buildbot image under ${FLAGS_buildbot_uri}"
     else
-      echo " * Grabbing buildbot image zip at URI ${FLAGS_grab_buildbot}"
+      echo " * Grab buildbot image zip at URI ${FLAGS_grab_buildbot}"
     fi
   fi
   if [[ ${FLAGS_mod_image_for_test} -eq ${FLAGS_TRUE} ]]; then
     echo " * Make image able to run tests (mod_image_for_test)"
     set_passwd=${FLAGS_TRUE}
   fi
   if [[ ${set_passwd} -eq ${FLAGS_TRUE} ]]; then
     if [[ -n "${FLAGS_chronos_passwd}" ]]; then
       echo " * Set chronos password to ${FLAGS_chronos_passwd}"
     else
@@ skipping 103 matching lines @@
 CHROMEOS_EXT_MIRROR="http://chromeos-deb/ubuntu"
 CHROMEOS_EXT_SUITE="karmic"
 
 # Assume Chrome is checked out nearby
 CHROMEOS_CHROME_DIR="${base_dir}/chrome"
 EOF
   fi
 }
 
 
+function check_rootfs_validity() {
+  echo "Checking rootfs validity"
+  local device=$(sudo losetup -f)
+  local invalid=0
+  sudo losetup "${device}" rootfs.image
+  sudo mount "${device}" rootfs
+  if [[ ! -e rootfs/boot/vmlinuz ]]; then
+    echo "This image has no kernel"
+    invalid=1
+  fi
+  sudo umount rootfs
+  sudo losetup -d "${device}"
+  return ${invalid}
+}
+
+
 # Downloads a buildbot image
 function grab_buildbot() {
   if [[ "${FLAGS_grab_buildbot}" == "LATEST" ]]; then
     local latest=$(curl "${FLAGS_buildbot_uri}/LATEST")
     if [[ -z "${latest}" ]]; then
       echo "Error finding latest."
       exit 1
     fi
     FLAGS_grab_buildbot="${FLAGS_buildbot_uri}/${latest}/image.zip"
   fi
   local dl_dir=$(mktemp -d "/tmp/image.XXXX")
   echo "Grabbing image from ${FLAGS_grab_buildbot} to ${dl_dir}"
   run_phase "Downloading image" curl "${FLAGS_grab_buildbot}" \
       -o "${dl_dir}/image.zip"
   cd "${dl_dir}"
   unzip image.zip
+  check_rootfs_validity
   echo "Copying in local_repo/local_packages"
   # TODO(kmixter): Make this architecture indep once buildbot is.
   mv -f local_repo/local_packages/* "${FLAGS_top}/src/build/x86/local_packages"
   local image_basename=$(basename $(dirname "${FLAGS_grab_buildbot}"))
   local image_dir="${FLAGS_top}/src/build/images/${image_basename}"
   echo "Copying in build image to ${image_dir}"
   rm -rf "${image_dir}"
   mkdir -p "${image_dir}"
   # Note that if mbr.image does not exist, this image was not successful.
   mv mbr.image rootfs.image "${image_dir}"
@@ skipping 95 matching lines @@
     run_phase "Running tests on Chromium OS machine ${FLAGS_remote}" \
       ./run_remote_tests.sh --remote="${FLAGS_remote}" ${FLAGS_test}
   fi
 
   echo "Successfully used ${FLAGS_top} to:"
   describe_steps
 }
 
 
 main $@