Merge lp:~psivaa/snappy-proposed-selftest-agent/request-id-in-payload into lp:snappy-proposed-selftest-agent

[Para Siva]

Adding request_id to the IMAGE_BUILD_QUEUE

This was figured out whilst looking at the tarmac failure on https://code.launchpad.net/~fginther/snappy-proposed-image-tester/update-container/+merge/260416

The 'snappy-proposed.packages.v1' should contain the request_id so that image-builder could pass it onto the tester.

[lp:~psivaa/snappy-proposed-selftest-agent/request-id-in-payload]

12. By Para Siva on 2015-05-28

device name is generic_amd64

[Paul Larson (pwlars)]

Good catch, I had that device name backwards. Thanks!

review: Approve

=== modified file 'snappy_proposed_selftest_agent/constants.py'
--- snappy_proposed_selftest_agent/constants.py	2015-05-28 05:26:08 +0000
+++ snappy_proposed_selftest_agent/constants.py	2015-05-28 11:13:01 +0000
@@ -50,4 +50,4 @@
 TEST_NAME = 'snappy-selftest'
 TEST_BRANCH = 'lp:snappy/selftest'
 CHANNEL = 'ubuntu-core/rolling/edge'
-DEVICE = 'amd64_generic'
+DEVICE = 'generic_amd64'

=== modified file 'snappy_proposed_selftest_agent/worker.py'
--- snappy_proposed_selftest_agent/worker.py	2015-05-28 03:49:52 +0000
+++ snappy_proposed_selftest_agent/worker.py	2015-05-28 11:13:01 +0000
@@ -59,6 +59,7 @@
         image_build_body['channel'] = constants.CHANNEL
         image_build_body['device'] = constants.DEVICE
         image_build_body['test_name'] = constants.TEST_NAME
+        image_build_body['request_id'] = request_id
         self.build_worker(image_build_body)
 
         # Build the message body to pass to the results exchange