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

« back to all changes in this revision

Viewing changes to candidate.py

  • Committer: Aaron Bentley
  • Date: 2016-03-01 21:23:25 UTC
  • mto: This revision was merged to the branch mainline in revision 1305.
  • Revision ID: aaron.bentley@canonical.com-20160301212325-ogp6t6l979xvbxq6
Use revision-build for parallel streams.

Show diffs side-by-side

added added

removed removed

Lines of Context:
24
24
from utility import (
25
25
    extract_deb,
26
26
    get_deb_arch,
27
 
    get_revision_build,
28
27
    run_command,
29
28
    s3_cmd,
30
29
    temp_dir,
31
30
)
32
31
 
33
32
 
 
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
 
34
45
def find_publish_revision_number(credentials, br_number, limit=20):
35
46
    """Return the publish-revsion number paired with build-revision number."""
36
47
    found_number = None
42
53
            return None
43
54
        # Ensure we have the real job number (an int), not an alias.
44
55
        job_number = build_data['number']
45
 
        if get_revision_build(build_data) == str(br_number):
 
56
        parameters = get_build_parameters(build_data)
 
57
        if parameters['revision_build'] == str(br_number):
46
58
            found_number = job_number
47
59
            break
48
60
        job_number = job_number - 1