Merge lp:~psivaa/snappy-proposed-image-tester/fix-pyflakes into lp:snappy-proposed-image-tester

[Para Siva]

Name the results container and tarball based on the request_id and pass container and tarball names on to the result-checker.

Name the results container and tarball based on the request_id and pass container and tarball names on to the result-checker.

[Celso Providelo (cprov)]

Francis,

Thanks for addressing this issue.

We discussed on IRC the necessity of unique tarball filenames by including the request_id (introduced in core-image-testing, adt-cloud uses results.tgz). We agreed that is a nice thing to have if several results get downloaded to the same path.

While I think it's still true for snappy-proposed, we want unique tarball filename, we will probably revisit this implementation to facilitate result aggregation based on our current talks with pitti.

review: Approve

[Ubuntu CI Bot (uci-bot)]

The attempt to merge lp:~fginther/snappy-proposed-image-tester/update-container into lp:snappy-proposed-image-tester failed. Below is the output from the failed tests.

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

Downloading/unpacking python-swiftclient==2.4.0 (from -r requirements.txt (line 3))
Downloading/unpacking python-keystoneclient==1.3.0 (from -r requirements.txt (line 4))
Downloading/unpacking uservice-utils==1.0.2.1 (from -r requirements.txt (line 5))
Downloading/unpacking anyjson>=0.3.3 (from kombu==3.0.24->-r requirements.txt (line 1))
  Running setup.py (path:/tmp/venv-snappy-proposed-image-testerfgyewk0l/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 1))
  Running setup.py (path:/tmp/venv-snappy-proposed-image-testerfgyewk0l/build/amqp/setup.py) egg_info for package amqp

Downloading/unpacking futures>=2.1.3 (from python-swiftclient==2.4.0->-r requirements.txt (line 3))
Downloading/unpacking requests>=1.1 (from python-swiftclient==2.4.0->-r requirements.txt (line 3))
Downloading/unpacking simplejson>=2.0.9 (from python-swiftclient==2.4.0->-r requirements.txt (line 3))
  Running setup.py (path:/tmp/venv-snappy-proposed-image-testerfgyewk0l/build/simplejson/setup.py) egg_info for package simplejson

Downloading/unpacking six>=1.5.2 (from python-swiftclient==2.4.0->-r requirements.txt (line 3))
Downloading/unpacking oslo.config>=1.9.0 (from python-keystoneclient==1.3.0->-r requirements.txt (line 4))
Downloading/unpacking netaddr>=0.7.12 (from python-keystoneclient==1.3.0->-r requirements.txt (line 4))
Downloading/unpacking stevedore>=1.1.0 (from python-keystoneclient==1.3.0->-r requirements.txt (line 4))
Downloading/unpacking Babel>=1.3 (from python-keystoneclient==1.3.0->-r requirements.txt (line 4))
  Running setup.py (path:/tmp/venv-snappy-proposed-image-testerfgyewk0l/build/Babel/setup.py) egg_info for package Babel

    warning: no previously-included files matching '*' found under directory 'docs/_build'
    warning: no previously-included files matching '*.pyc' found under directory 'tests'
    warning: no previously-included files matching '*.pyo' found under directory 'tests'
Downloading/unpacking iso8601>=0.1.9 (from python-keystoneclient==1.3.0->-r requirements.txt (line 4))
Downloading/unpacking oslo.serialization>=1.2.0 (from python-keystoneclient==1.3.0->-r requirements.txt (line 4))
Downloading/unpacking oslo.utils>=1.2.0 (from python-keystoneclient==1.3.0->-r requirements.txt (line 4))
Downloading/unpacking pbr>=0.6,!=0.7,<1.0 (from...

[Francis Ginther (fginther)]

psivaa, thanks for cleaning this up.

review: Approve

=== modified file 'snappy_proposed_image_tester/worker.py'
--- snappy_proposed_image_tester/worker.py	2015-05-27 18:28:14 +0000
+++ snappy_proposed_image_tester/worker.py	2015-05-28 09:30:14 +0000
@@ -55,9 +55,7 @@
         tarball_path = None
         try:
             nova_image_id = body['nova_image_id']
-            image_name = body['image_name']
-            device = body['device']
-            channel = body['channel']
+            request_id = body['request_id']
             test_branch = body['test_branch']
         except KeyError as e:
             logger.error("Message does not contain required ", extra=extra)
@@ -97,13 +95,11 @@
                     extra=extra
                 )
 
-                container_name = "snappy-proposed-{}-{}-{}".format(
-                    channel,
-                    device,
-                    image_name,
-                ).replace('/', '_')
+                container_name = "snappy-proposed-{}".format(request_id)
                 tarball_root = container_name + "-results"
                 tarball_filename = tarball_root + ".tgz"
+                body['swift_container_name'] = container_name
+                body['swift_tarball_filename'] = tarball_filename
                 _create_run_metadata_file(result_dir, body)
                 tarball_path = tar_directory(result_dir, tarball_root)
                 try: