Converted VM_CPUS and VM_MEMORY to int
authorEd Bartosh <eduard.bartosh@intel.com>
Wed, 2 Oct 2013 15:13:44 +0000 (18:13 +0300)
committerGerrit Code Review <gerrit2@otctools.jf.intel.com>
Wed, 9 Oct 2013 06:22:28 +0000 (23:22 -0700)
When VM_CPUS and VM_MEMORY are taken from configuration file they have
to be converted to int to avoid this traceback:

Traceback (most recent call last):
  File "/var/lib/jenkins/jobs/image-creator/workspace/jenkins-scripts/job_imager.py", line 142, in <module>
    sys.exit(main())
  File "/var/lib/jenkins/jobs/image-creator/workspace/jenkins-scripts/job_imager.py", line 94, in main
    os.getenv("VM_CPUS", 8), basedir)
  File "/var/lib/jenkins/jobs/image-creator/workspace/jenkins-scripts/job_imager.py", line 33, in run_inside_vm
    (vm_memory, vm_cpus, vm_image, basedir)
TypeError: %d format: a number is required, not str

Change-Id: Ib18cbd320f013e8b3d9075dadf22840131e07bc1
Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>
job_imager.py

index 465cb47..6673def 100755 (executable)
@@ -90,8 +90,8 @@ def main():
 
         print 'starting mic inside VM to create image'
         sys.stdout.flush()
-        ret = run_inside_vm(vm_image, os.getenv("VM_MEMORY", 8192),
-                            os.getenv("VM_CPUS", 8), basedir)
+        ret = run_inside_vm(vm_image, int(os.getenv("VM_MEMORY", 8192)),
+                            int(os.getenv("VM_CPUS", 8)), basedir)
         # workaround for qemu/9p bug in mapping permissions
         set_permissions(outdir, (0644, 0755))
     else: