← Back to branch summary

~andrewjbeach/juju-ci-tools/make-local-patcher

« back to all changes in this revision

Viewing changes to candidate.py

  • Committer: Curtis Hovey
  • Date: 2016-09-20 01:59:47 UTC
  • mto: This revision was merged to the branch mainline in revision 1602.
  • Revision ID: curtis@canonical.com-20160920015947-ko27xkj3a4i774h6
Convert juju instance=ids to true azuzre ids.

Show diffs side-by-side

added added

removed removed

Lines of Context:
candidate.py
24
24
from utility import (
25
25
    extract_deb,
26
26
    get_deb_arch,
 
27
    get_revision_build,
27
28
    run_command,
28
29
    s3_cmd,
29
30
    temp_dir,
30
31
)
31
32
 
32
33
 
33
 
def get_build_parameters(build_data):
34
 
    parameters = {}
35
 
    action_list = build_data['actions']
36
 
    for acts in action_list:
37
 
        for key in acts.keys():
38
 
            if key == 'parameters':
39
 
                for act in acts[key]:
40
 
                    parameters[act['name']] = act['value']
41
 
            break
42
 
    return parameters
43
 
 
44
 
 
45
34
def find_publish_revision_number(credentials, br_number, limit=20):
46
35
    """Return the publish-revsion number paired with build-revision number."""
47
36
    found_number = None
53
42
            return None
54
43
        # Ensure we have the real job number (an int), not an alias.
55
44
        job_number = build_data['number']
56
 
        parameters = get_build_parameters(build_data)
57
 
        if parameters['revision_build'] == str(br_number):
 
45
        if get_revision_build(build_data) == str(br_number):
58
46
            found_number = job_number
59
47
            break
60
48
        job_number = job_number - 1