]> git-server-git.apps.pok.os.sepia.ceph.com Git - teuthology.git/commitdiff
task.install: use builder.codename for deb repos
authorZack Cerza <zack@redhat.com>
Fri, 9 Sep 2016 16:24:20 +0000 (10:24 -0600)
committerZack Cerza <zack@redhat.com>
Tue, 4 Oct 2016 15:01:20 +0000 (09:01 -0600)
Signed-off-by: Zack Cerza <zack@redhat.com>
teuthology/task/install.py

index 96f2522a339449b68bde404be20a9000faa8e80a..bd67a8cc95ed9500065c5c57ecd310699e3000ce 100644 (file)
@@ -89,7 +89,7 @@ def _update_deb_package_list_and_install(ctx, remote, debs, config):
 
     remote.run(
         args=[
-            'echo', 'deb', builder.base_url, builder.distro, 'main',
+            'echo', 'deb', builder.base_url, builder.codename, 'main',
             run.Raw('|'),
             'sudo', 'tee', '/etc/apt/sources.list.d/{proj}.list'.format(
                 proj=config.get('project', 'ceph')),
@@ -725,8 +725,6 @@ def _upgrade_deb_packages(ctx, config, remote, debs):
         )
 
     builder = _get_builder_project(ctx, remote, config)
-    # get distro name and arch
-    dist = builder.distro
     base_url = builder.base_url
     log.info('Pulling from %s', base_url)
 
@@ -735,7 +733,7 @@ def _upgrade_deb_packages(ctx, config, remote, debs):
 
     remote.run(
         args=[
-            'echo', 'deb', base_url, dist, 'main',
+            'echo', 'deb', base_url, builder.codename, 'main',
             run.Raw('|'),
             'sudo', 'tee', '/etc/apt/sources.list.d/{proj}.list'.format(
                 proj=config.get('project', 'ceph')),