← Back to branch summary

~pwlars/adt-continuous-deployer/clean-up-core-images

« back to all changes in this revision

Viewing changes to mojo.py

  • Committer: Ubuntu CI Bot
  • Author(s): Francis Ginther
  • Date: 2015-04-22 22:20:31 UTC
  • mfrom: (40.1.1 fix-devel-mirror)
  • Revision ID: ubuntu_ci_bot-20150422222031-7byq03rm7e4cg1o6
Add a --devel option for adt.archive_mirror.

This fixes the problem introduced by https://code.launchpad.net/~fginther/adt-continuous-deployer/specify-archive-mirror/+merge/257026 [r=Celso Providelo, Thomi Richards]

Show diffs side-by-side

added added

removed removed

Lines of Context:
mojo.py
53
53
        'max_retries': 3,
54
54
        'image_flavor': kwargs.get('adt_image_flavor'),
55
55
        'test_branch': 'lp:snappy/selftest',
56
 
        'archive_mirror': 'http://ftpmaster.internal/',
 
56
        'archive_mirror': kwargs.get('adt_archive_mirror'),
57
57
    }
58
58
 
59
59
    c['image'] = {
151
151
    ]).strip()
152
152
    computed_adt_image_flavor = (
153
153
        'cpu2-ram2-disk50' if not args.devel else 'm1.small')
 
154
    computed_adt_archive_mirror = (
 
155
        'http://ftpmaster.internal/' if not args.devel else
 
156
        'http://nova.clouds.archive.ubuntu.com/ubuntu/')
154
157
 
155
158
    create_service_conf(
156
159
        args.project,
167
170
        os_region_name=args.os_region_name,
168
171
        nova_extra_args=computed_nova_extra_args,
169
172
        adt_image_flavor=computed_adt_image_flavor,
 
173
        adt_archive_mirror=computed_adt_archive_mirror,
170
174
    )
171
175
 
172
176
    # Juju environment & mojo workspaces have identical names. Names