jenkins scripting

1 files changed, 3 insertions, 5 deletions

diff --git a/ci-script.py b/ci-script.py
index dccd677..38b2e7a 100755
--- a/ci-script.py
+++ b/ci-script.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 from __future__ import print_function
 from libs.environment import *
@@ -7,7 +7,6 @@ from libs.keystone import *
 import argparse
 import glob
 import os
-import shlex
 import subprocess
 import sys
 import yaml
@@ -35,10 +34,9 @@ def check_image_tag_current(glance, manifest):
 
 
 def create_image(manifest):
-    cmd = shlex.quote("disk-image-create %s -t %s -o /tmp/%s.%s 2>&1" % (manifest["elements"], manifest["image_type"], manifest["image_name"], manifest["image_type"]))
-    cmdparts = shlex.split(cmd)
+    cmd = "disk-image-create %s -t %s -o /tmp/%s.%s 2>&1" % (manifest["elements"], manifest["image_type"], manifest["image_name"], manifest["image_type"])
     env = manifest["extra_envs"] if "extra_envs" in manifest else None
-    p = subprocess.Popen(cmdparts, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env)
+    p = subprocess.Popen([cmd], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env)
     out, err = p.communicate()
     if p.returncode != 0:
         raise Exception("Error running diskimage-builder:\n%s\n%s" % (out, err))