← Back to branch summary

~andreserl/maas/fix_2.0_ci

« back to all changes in this revision

Viewing changes to maas-integration.py

  • Committer: MAAS Lander
  • Author(s): Brendan Donegan
  • Date: 2016-08-01 19:26:18 UTC
  • mfrom: (442.1.3 bootstrap_no_upload_tools)
  • Revision ID: maas_lander-20160801192618-9wcthnljo6961e7b
[r=andreserl][bug=][author=brendan-donegan] Remove use of upload-tools from juju bootstrap test as it is broken in Juju at the moment

Show diffs side-by-side

added added

removed removed

Lines of Context:
maas-integration.py
428
428
        while True:
429
429
            status = self.get_juju_status()
430
430
            try:
431
 
                units = status['services'][application]['units'].values()
 
431
                units = status['applications'][application]['units'].values()
432
432
            except KeyError:
433
433
                units = []
434
434
            started_units = [
1083
1083
http-proxy: {proxy}
1084
1084
https-proxy: {proxy}""".format(proxy=HTTP_PROXY).encode('utf8'))
1085
1085
            bootstrap_config.file.flush()
 
1086
            env = os.environ.copy()
 
1087
            env['http_proxy'] = HTTP_PROXY
 
1088
            env['https_proxy'] = HTTP_PROXY
1086
1089
            retcode, _, _ = self._run_juju_command([
1087
 
                'bootstrap', 'autopkgtest', 'testmaas', '--upload-tools',
 
1090
                'bootstrap', 'autopkgtest', 'testmaas',
1088
1091
                '--config={config}'.format(config=bootstrap_config.name)
1089
 
            ])
 
1092
            ], env=env)
1090
1093
            self.assertThat(retcode, Equals(0))
1091
1094
 
1092
1095
    @skipIf(DO_NOT_TEST_JUJU, "Not testing juju")