← Back to branch summary

~joetalbott/core-image-tester/fix_names

« back to all changes in this revision

Viewing changes to core_image_tester/worker.py

  • Committer: Ubuntu CI Bot
  • Author(s): Celso Providelo
  • Date: 2015-05-08 15:11:16 UTC
  • mfrom: (33.1.1 adt-nova-creds)
  • Revision ID: ubuntu_ci_bot-20150508151116-pt0oqt590ejcsv1z
Using [adt] nova credentials (os_*) for spinning testbeds. [r=Parameswaran Sivatharman, Francis Ginther]

Show diffs side-by-side

added added

removed removed

Lines of Context:
core_image_tester/worker.py
197
197
 
198
198
    """
199
199
    adt_env = {
200
 
        k.upper(): v for k, v in config['nova'].items() if k.startswith('os')
 
200
        k.upper(): v for k, v in config['adt'].items() if k.startswith('os')
201
201
    }
202
202
    adt_args = [
203
203
        'adt-run',
210
210
        '--image', nova_image,
211
211
        '--console', os.path.join(result_dir, 'nova-console.log'),
212
212
    ]
213
 
    if 'extra_args' in config['nova']:
214
 
        adt_args.append(config['nova']['extra_args'])
 
213
    if 'extra_args' in config['adt']:
 
214
        adt_args.append(config['adt']['extra_args'])
215
215
 
216
216
    try:
217
217
        utils.check_call(adt_args, env=adt_env)