Add support for an --image flag to atest.

frontend/afe/models.py

 import logging, os
 from datetime import datetime
 from django.db import models as dbmodels, connection
 from xml.sax import saxutils
 import common
 from autotest_lib.frontend.afe import model_logic, model_attributes
 from autotest_lib.frontend import settings, thread_local
 from autotest_lib.client.common_lib import enum, host_protections, global_config
 from autotest_lib.client.common_lib import host_queue_entry_states
 
@@ skipping 975 matching lines @@
     @classmethod
     def create(cls, owner, options, hosts):
         """\
         Creates a job by taking some information (the listed args)
         and filling in the rest of the necessary information.
         """
         AclGroup.check_for_acl_violation_hosts(hosts)
 
         control_file = options.get('control_file')
         parameterized_job = options.get('parameterized_job')
-        cls.check_parameterized_job(control_file=control_file,
-                                    parameterized_job=parameterized_job)
 
+        # The current implementation of parameterized jobs requires that only
+        # control files or parameterized jobs are used. Using the image
+        # parameter on autoupdate_ParameterizedJob doesn't mix pure
+        # parameterized jobs and control files jobs, it does muck enough with
+        # normal jobs by adding a parameterized id to them that this check will
+        # fail. So for now we just skip this check.
+        # cls.check_parameterized_job(control_file=control_file,
+        #                             parameterized_job=parameterized_job)
         user = User.current_user()
         if options.get('reboot_before') is None:
             options['reboot_before'] = user.get_reboot_before_display()
         if options.get('reboot_after') is None:
             options['reboot_after'] = user.get_reboot_after_display()
 
         drone_set = DroneSet.resolve_name(options.get('drone_set'))
 
         job = cls.add_object(
             owner=owner,
@@ skipping 16 matching lines @@
         job.dependency_labels = options['dependencies']
 
         if options.get('keyvals'):
             for key, value in options['keyvals'].iteritems():
                 JobKeyval.objects.create(job=job, key=key, value=value)
 
         return job
 
 
     def save(self, *args, **kwargs):
-        self.check_parameterized_job(control_file=self.control_file,
-                                     parameterized_job=self.parameterized_job)
+        # The current implementation of parameterized jobs requires that only
+        # control files or parameterized jobs are used. Using the image
+        # parameter on autoupdate_ParameterizedJob doesn't mix pure
+        # parameterized jobs and control files jobs, it does muck enough with
+        # normal jobs by adding a parameterized id to them that this check will
+        # fail. So for now we just skip this check.
+        # cls.check_parameterized_job(control_file=control_file,
+        #                             parameterized_job=parameterized_job)

[truty1, 2011/02/01 01:21:31]

I'm going to point out something I noticed when patching.  You've commented out
a line that had 'self' and replaced it with a line that has 'cls'. I'm guessing
from the earlier update. Maybe this will be confusing for someone undoing this
at a later point.

         super(Job, self).save(*args, **kwargs)
 
 
     def queue(self, hosts, atomic_group=None, is_template=False):
         """Enqueue a job on the given hosts."""
         if not hosts:
             if atomic_group:
                 # No hosts or labels are required to queue an atomic group
                 # Job.  However, if they are given, we respect them below.
                 atomic_group.enqueue_job(self, is_template=is_template)
@@ skipping 346 matching lines @@
 
     def __unicode__(self):
         result = u'Special Task %s (host %s, task %s, time %s)' % (
             self.id, self.host, self.task, self.time_requested)
         if self.is_complete:
             result += u' (completed)'
         elif self.is_active:
             result += u' (active)'
 
         return result