Merge lp:~joetalbott/snappy-proposed-image-builder/use_tmpdir into lp:snappy-proposed-image-builder

[Joe Talbott]

Fix tmpdir usage.

Fix tmpdir usage.

[Celso Providelo (cprov)]

review: Approve

[Francis Ginther (fginther)]

Just a nit-pick, feel free to merge.

review: Approve

[Joe Talbott (joetalbott)]

review: Approve

[Ubuntu CI Bot (uci-bot)]

The attempt to merge lp:~joetalbott/snappy-proposed-image-builder/use_tmpdir into lp:snappy-proposed-image-builder failed. Below is the output from the failed tests.

Using base prefix '/usr'
New python executable in /tmp/venv-snappy-proposed-image-builderbxn26k3q/bin/python3
Also creating executable in /tmp/venv-snappy-proposed-image-builderbxn26k3q/bin/python
Installing setuptools, pip...done.
Running virtualenv with interpreter /usr/bin/python3
Ignoring indexes: https://pypi.python.org/simple/
Downloading/unpacking idna (from -r requirements.txt (line 5))
  Running setup.py (path:/tmp/venv-snappy-proposed-image-builderbxn26k3q/build/idna/setup.py) egg_info for package idna

    warning: no previously-included files matching '*.pyc' found under directory 'tools'
    warning: no previously-included files matching '*.pyc' found under directory 'tests'
Downloading/unpacking cffi (from -r requirements.txt (line 6))
  Running setup.py (path:/tmp/venv-snappy-proposed-image-builderbxn26k3q/build/cffi/setup.py) egg_info for package cffi

Downloading/unpacking pyasn1 (from -r requirements.txt (line 7))
  Running setup.py (path:/tmp/venv-snappy-proposed-image-builderbxn26k3q/build/pyasn1/setup.py) egg_info for package pyasn1

Downloading/unpacking kombu==3.0.24 (from -r requirements.txt (line 8))
Downloading/unpacking python-logstash==0.4.2 (from -r requirements.txt (line 9))
  Running setup.py (path:/tmp/venv-snappy-proposed-image-builderbxn26k3q/build/python-logstash/setup.py) egg_info for package python-logstash

Downloading/unpacking python-glanceclient==0.17.0 (from -r requirements.txt (line 10))
Downloading/unpacking uservice-utils==1.0.3 (from -r requirements.txt (line 11))
Downloading/unpacking traceback2==1.4.0 (from -r requirements.txt (line 12))
Downloading/unpacking pycparser (from cffi->-r requirements.txt (line 6))
  Running setup.py (path:/tmp/venv-snappy-proposed-image-builderbxn26k3q/build/pycparser/setup.py) egg_info for package pycparser

    warning: no previously-included files matching 'yacctab.*' found under directory 'tests'
    warning: no previously-included files matching 'lextab.*' found under directory 'tests'
    warning: no previously-included files matching 'yacctab.*' found under directory 'examples'
    warning: no previously-included files matching 'lextab.*' found under directory 'examples'
Downloading/unpacking anyjson>=0.3.3 (from kombu==3.0.24->-r requirements.txt (line 8))
  Running setup.py (path:/tmp/venv-snappy-proposed-image-builderbxn26k3q/build/anyjson/setup.py) egg_info for package anyjson

Downloading/unpacking amqp>=1.4.5,<2.0 (from kombu==3.0.24->-r requirements.txt (line 8))
  Running setup.py (path:/tmp/venv-snappy-proposed-image-builderbxn26k3q/build/amqp/setup.py) egg_info for package amqp

Downloading/unpacking pbr>=0.6,!=0.7,<1.0 (from python-glanceclient==0.17.0->-r requirements.txt (line 10))
Downloading/unpacking argparse (from python-glanceclient==0.17.0->-r requirements.txt (line 10))
Downloading/unpacking PrettyTable>=0.7,<0.8 (from python-glanceclient==0.17.0->-r requirements.txt (line 10))
  Running setup.py (path:/tmp/venv-snappy-proposed-image-builderbxn26k3...

[lp:~joetalbott/snappy-proposed-image-builder/use_tmpdir]

16. By Joe Talbott on 2015-06-05

Fix flake8 warnings.

[Joe Talbott (joetalbott)]

review: Approve

=== modified file 'snappy_proposed_image_builder/worker.py'
--- snappy_proposed_image_builder/worker.py	2015-06-02 17:16:50 +0000
+++ snappy_proposed_image_builder/worker.py	2015-06-05 21:22:58 +0000
@@ -37,6 +37,10 @@
 logger = logging.getLogger(__name__)
 
 
+ubuntu_device_flash = os.path.join(os.path.dirname(os.path.abspath(__file__)),
+                                   '..', 'ubuntu-device-flash')
+
+
 class RootFSError(Exception):
     pass
 
@@ -109,6 +113,7 @@
                 try:
                     rootfs_path = download_rootfs(
                         image_version,
+                        release,
                         channel,
                         device,
                         tmpdir
@@ -187,7 +192,7 @@
     image_path = os.path.join(tmpdir, 'snappy-proposed-{}.img'.format(name))
 
     cmd = ['sudo',
-           './ubuntu-device-flash',
+           ubuntu_device_flash,
            '--revision', name,
            '--download-only',
            'core',
@@ -198,14 +203,14 @@
            '--developer-mode',
            '--cloud',
            release]
-    check_call(cmd)
+    check_call(cmd, cwd=tmpdir)
 
     cmd = ['sudo',
            'rm',
            '-rf',
            os.path.join(tmpdir, '.gnupg')]
     check_call(cmd)
-    output = glob.glob('ubuntu-*.tar.xz')
+    output = glob.glob(os.path.join(tmpdir, 'ubuntu-*.tar.xz'))
     return output[0]
 
 
@@ -363,7 +368,7 @@
     """Download the ubuntu code image, return a path to it on disk."""
     image_path = os.path.join(tmpdir, 'snappy-proposed-{}.img'.format(name))
     cmd = ['sudo',
-           './ubuntu-device-flash',
+           ubuntu_device_flash,
            '--revision', name,
            'core',
            '--device', device,
@@ -422,7 +427,7 @@
     """Obtains a bytestring of the images info from the core image server"""
     extra = LOGGING_EXTRA.copy()
     cmd = [
-        './ubuntu-device-flash',
+        ubuntu_device_flash,
         'query',
         '--show-image',
         '--channel=ubuntu-core/{}/{}'.format(release, channel),