Factored out the code to copy an image and modify it for test

image_to_vm.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 convert the output of build_image.sh to a VMware image and write a
 # corresponding VMware config file.
 
 # --- BEGIN COMMON.SH BOILERPLATE ---
@@ skipping 29 matching lines @@
 
 get_default_board
 
 # Flags
 DEFINE_string board "${DEFAULT_BOARD}" \
   "Board for which the image was built"
 DEFINE_boolean factory $FLAGS_FALSE \
     "Modify the image for manufacturing testing"
 DEFINE_boolean factory_install $FLAGS_FALSE \
     "Modify the image for factory install shim"
-DEFINE_boolean force_copy ${FLAGS_FALSE} "Always rebuild test image"
+
+# We default to TRUE so the buildbot gets its image. Note this is different
+# behavior from image_to_usb.sh
+DEFINE_boolean force_copy ${FLAGS_TRUE} "Always rebuild test image"
 DEFINE_string format "qemu" \
   "Output format, either qemu, vmware or virtualbox"
 DEFINE_string from "" \
   "Directory containing rootfs.image and mbr.image"
 DEFINE_boolean full "${FLAGS_FALSE}" "Build full image with all partitions."
 DEFINE_boolean make_vmx ${FLAGS_TRUE} \
   "Create a vmx file for use with vmplayer (vmware only)."
 DEFINE_integer mem "${DEFAULT_MEM}" \
   "Memory size for the vm config in MBs (vmware only)."
 DEFINE_integer rootfs_partition_size 1024 \
   "rootfs parition size in MBs."
 DEFINE_string state_image "" \
   "Stateful partition image (defaults to creating new statful partition)"
 DEFINE_integer statefulfs_size 2048 \
   "Stateful partition size in MBs."
 DEFINE_boolean test_image "${FLAGS_FALSE}" \
-  "Copies normal image to chromiumos_test_image.bin, modifies it for test."
+  "Copies normal image to ${CHROMEOS_TEST_IMAGE_NAME}, modifies it for test."
 DEFINE_string to "" \
   "Destination folder for VM output file(s)"
 DEFINE_string vbox_disk "${DEFAULT_VBOX_DISK}" \
   "Filename for the output disk (virtualbox only)."
 DEFINE_integer vdisk_size 3072 \
   "virtual disk size in MBs."
 DEFINE_string vmdk "${DEFAULT_VMDK}" \
   "Filename for the vmware disk image (vmware only)."
 DEFINE_string vmx "${DEFAULT_VMX}" \
   "Filename for the vmware config (vmware only)."
@@ skipping 23 matching lines @@
 # Default to the most recent image
 if [ -z "${FLAGS_from}" ] ; then
   FLAGS_from="$(./get_latest_image.sh --board=${FLAGS_board})"
 else
   pushd "${FLAGS_from}" && FLAGS_from=`pwd` && popd
 fi
 if [ -z "${FLAGS_to}" ] ; then
   FLAGS_to="${FLAGS_from}"
 fi
 
-# Use this image as the source image to copy
-SRC_IMAGE="${FLAGS_from}/chromiumos_image.bin"
-
-# If we're asked to modify the image for test, then let's make a copy and
-# modify that instead.
 if [ ${FLAGS_test_image} -eq ${FLAGS_TRUE} ] ; then
-  if [ ! -f "${FLAGS_from}/chromiumos_test_image.bin" ] || \
-     [ ${FLAGS_force_copy} -eq ${FLAGS_TRUE} ] ; then
-    # Copy it.
-    echo "Creating test image from original..."
-    cp -f "${SRC_IMAGE}" "${FLAGS_from}/chromiumos_test_image.bin"
-
-    # Check for manufacturing image.
-    if [ ${FLAGS_factory} -eq ${FLAGS_TRUE} ] ; then
-      EXTRA_ARGS="--factory"
-    fi
-
-    # Check for install shim.
-    if [ ${FLAGS_factory_install} -eq ${FLAGS_TRUE} ] ; then
-      EXTRA_ARGS="--factory_install"
-    fi
-
-    # Modify it.  Pass --yes so that mod_image_for_test.sh won't ask us if we
-    # really want to modify the image; the user gave their assent already with
-    # --test-image and the original image is going to be preserved.
-    "${SCRIPTS_DIR}/mod_image_for_test.sh" --board=${FLAGS_board} --image \
-      "${FLAGS_from}/chromiumos_test_image.bin" ${EXTRA_ARGS} --yes
-    echo "Done with mod_image_for_test."
-  else
-    echo "Using cached test image."
-  fi
-  SRC_IMAGE="${FLAGS_from}/chromiumos_test_image.bin"
-  echo "Source test image is: ${SRC_IMAGE}"
+  # Make a test image - this returns the test filename in CHROMEOS_RETURN_VAL
+  prepare_test_image "${FLAGS_from}" "${CHROMEOS_IMAGE_NAME}"
+  SRC_IMAGE="${CHROMEOS_RETURN_VAL}"
+else
+  # Use the standard image
+  SRC_IMAGE="${FLAGS_from}/${CHROMEOS_IMAGE_NAME}"
 fi
 
 # Memory units are in MBs
 TEMP_IMG="$(dirname "${SRC_IMAGE}")/vm_temp_image.bin"
 
 # If we're not building for VMWare, don't build the vmx
 if [ "${FLAGS_format}" != "vmware" ]; then
   FLAGS_make_vmx="${FLAGS_FALSE}"
 fi
 
@@ skipping 151 matching lines @@
   echo "${VMX_CONFIG}"
 fi
 
 
 if [ "${FLAGS_format}" == "qemu" ]; then
   echo "If you have qemu-kvm installed, you can start the image by:"
   echo "sudo kvm -m ${FLAGS_mem} -vga std -pidfile /tmp/kvm.pid -net nic,model=virtio " \
        "-net user,hostfwd=tcp::9222-:22 \\"
   echo "        -hda ${FLAGS_to}/${DEFAULT_QEMU_IMAGE}"
 fi