core-image-tester

Merge lp:~psivaa/core-image-tester/remove-test-branch-conf-option into lp:~canonical-ci-engineering/core-image-tester/snappy-proposed-migration

  1. remove-test-branch-conf-option
  2. Merge into snappy-proposed-migration
Proposed by Para Siva
Status: Merged
Approved by: Para Siva
Approved revision: 38
Merged at revision: 37
Proposed branch: lp:~psivaa/core-image-tester/remove-test-branch-conf-option
Merge into: lp:~canonical-ci-engineering/core-image-tester/snappy-proposed-migration
Diff against target: 68 lines (+4/-6)
3 files modified
README.rst (+1/-2)
core-service.conf (+0/-1)
core_image_tester/worker.py (+3/-3)
To merge this branch: bzr merge lp:~psivaa/core-image-tester/remove-test-branch-conf-option
Reviewer Review Type Date Requested Status
Celso Providelo (community) Approve
Review via email: mp+260186@code.launchpad.net

Commit message

Removing test_branch from image-tester to move into test-agent

Description of the change

Removing test_branch from image-tester to move into test-agent.

To post a comment you must log in.
Revision history for this message
Celso Providelo (cprov) wrote :

Psivaa,

Thanks for working on this, very good!

Do we have tarmac for these branches ?

review: Approve
Revision history for this message
Para Siva (psivaa) wrote :

Thanks for the review cprov, yea we have this branch enabled in tarmac

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README.rst'
2--- README.rst 2015-05-08 05:05:23 +0000
3+++ README.rst 2015-05-26 16:30:06 +0000
4@@ -8,7 +8,7 @@
5
6 Branch the code::
7
8- $ bzr branch lp:core-image-tester
9+ $ bzr branch lp:~canonical-ci-engineering/core-image-tester/snappy-proposed-migration
10
11 Install the Service
12 ===================
13@@ -90,7 +90,6 @@
14
15 [adt]
16 image_flavor = m1.smaller
17- test_branch = lp:snappy/selftest
18 os_username = bar
19 os_password = <redacted>
20 os_tenant_name = bar_project
21
22=== modified file 'core-service.conf'
23--- core-service.conf 2015-05-08 05:05:23 +0000
24+++ core-service.conf 2015-05-26 16:30:06 +0000
25@@ -9,7 +9,6 @@
26
27 [adt]
28 image_flavor = m1.smaller
29-test_branch = lp:snappy/selftest
30 os_username = foo
31 os_password = <redacted>
32 os_tenant_name = foo_project
33
34=== modified file 'core_image_tester/worker.py'
35--- core_image_tester/worker.py 2015-05-08 05:05:23 +0000
36+++ core_image_tester/worker.py 2015-05-26 16:30:06 +0000
37@@ -58,20 +58,19 @@
38 image_name = body['image_name']
39 device = body['device']
40 channel = body['channel']
41+ test_branch = body['test_branch']
42 except KeyError as e:
43 logger.error("Message does not contain required ", extra=extra)
44 return MessageActions.Retry
45
46 with tempfile.TemporaryDirectory() as test_dir:
47 logger.info("Downloading test sources...", extra=extra)
48- test_branch = self.config['adt']['test_branch']
49 try:
50 get_test_sources(test_dir, test_branch)
51 except utils.BetterCalledProcessError as e:
52 logger.error("Unable to retrieve test sources: %s",
53 e, extra=extra)
54 return MessageActions.Retry
55- body['test_branch'] = test_branch
56 body['test_branch_revno'] = get_test_sources_revno(test_branch)
57 extra.update(body)
58 logger.info("Test sources downloaded OK.", extra=extra)
59@@ -139,7 +138,8 @@
60
61
62 def _create_run_metadata_file(directory, request):
63- """Create a metadata file in 'directory' with some of the data from 'request'
64+ """Create a metadata file in 'directory' with some of the data from
65+ 'request'
66
67 We want to make sure that, as (potentially confidential) items are added to
68 the request that we don't blindly add them to the metadata file, so we

Subscribers

People subscribed via source and target branches