revert virtualenv changes

examples/docker-manifest.yml

@@ -0,0 +1,13 @@
+---
+settings:
+  package_name_format: 'openstack-{{ project.name }}-{{ settings.version }}'
+  build_type: package
+  version: '10.0-bbc1'
+  base_path: '/openstack'
+  force_overwrite: true
+
+projects:
+  - name: glance
+    gitref: stable/kilo
+  - name: heat
+    gitref: stable/kilo

giftwrap/builders/__init__.py

@@ -74,7 +74,7 @@ class Builder(object):
         # finish up
         self._finalize_project_build(project)
 
-    def build(self, project):
+    def build(self):
         spec = self._spec
 
         self._prepare_build()
@@ -87,7 +87,7 @@ class Builder(object):
         for project in spec.projects:
             self._build_project(project)
 
-        self._finalize_build(project)
+        self._finalize_build()
 
     def cleanup(self):
         self._cleanup_build()

giftwrap/builders/docker_builder.py

@@ -71,6 +71,7 @@ class DockerBuilder(Builder):
         self._commands.append("mkdir -p -m %o %s" % (mode, path))
 
     def _prepare_project_build(self, project):
+        self.image_name = "giftwrap/openstack:%s" % (project.version)
         return
 
     def _clone_project(self, giturl, name, gitref, depth, path):
@@ -79,10 +80,11 @@ class DockerBuilder(Builder):
         self._commands.append(cmd)
 
     def _create_virtualenv(self, venv_command, path):
-        return
+        self._execute(venv_command, path)
 
     def _install_pip_dependencies(self, venv_path, dependencies):
-        self._execute("pip install %s" % (dependencies))
+        pip_path = self._get_venv_pip_path(venv_path)
+        self._execute("%s install %s" % (pip_path, dependencies))
 
     def _copy_sample_config(self, src_clone_dir, project):
         src_config = os.path.join(src_clone_dir, 'etc')
@@ -92,19 +94,20 @@ class DockerBuilder(Builder):
             src_config, src_config, dest_config))
 
     def _install_project(self, venv_path, src_clone_dir):
-        self._execute("pip install %s" % (src_clone_dir))
+        pip_path = self._get_venv_pip_path(venv_path)
+        self._execute("%s install %s" % (pip_path, src_clone_dir))
 
     def _finalize_project_build(self, project):
         self._commands.append("rm -rf %s" % self._temp_dir)
         for command in self._commands:
             print command
 
-    def _finalize_build(self, project):
+    def _finalize_build(self):
         template_vars = {
             'commands': self._commands
         }
         print self._render_dockerfile(template_vars)
-        self._build_image(project)
+        self._build_image()
 
     def _cleanup_build(self):
         return
@@ -126,7 +129,7 @@ class DockerBuilder(Builder):
         template = template_env.get_template(DEFAULT_TEMPLATE_FILE)
         return template.render(template_vars)
 
-    def _build_image(self, project):
+    def _build_image(self):
         template_vars = {
             'commands': self._commands
         }
@@ -136,13 +139,10 @@ class DockerBuilder(Builder):
         dockerfile = os.path.join(tempdir, 'Dockerfile')
         with open(dockerfile, "w") as w:
             w.write(dockerfile_contents)
-
-        tag = "openstack-%s:%s" % (project.name, project.version)
-
         docker_client = docker.Client(base_url='unix://var/run/docker.sock',
                                       timeout=10)
         build_result = docker_client.build(path=tempdir, stream=True,
-                                           tag=tag)
+                                           tag=self.image_name)
         for line in build_result:
             LOG.info(line.strip())
 

giftwrap/builders/package_builder.py

@@ -96,7 +96,7 @@ class PackageBuilder(Builder):
                       project.system_dependencies)
         pkg.build()
 
-    def _finalize_build(self, project):
+    def _finalize_build(self):
         return
 
     def _cleanup_build(self):

giftwrap/shell.py

@@ -55,7 +55,7 @@ def build(args):
             sys.exit()
         signal.signal(signal.SIGINT, _signal_handler)
 
-        builder.build(args)
+        builder.build()
     except Exception as e:
         LOG.exception("Oops something went wrong: %s", e)
         fail = True