~patviafore/vmbuilder/jenkins_kvm

« back to all changes in this revision

Viewing changes to templates/img-update.tmpl

  • Committer: Phil Roche
  • Date: 2019-11-14 14:08:39 UTC
  • mfrom: (833.1.1 jenkins_kvm)
  • Revision ID: phil.roche@canonical.com-20191114140839-hbp0vpvp1kf1skxc
Merge lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm-philroche-eoan-python3-openstackclient into lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm [a=philroche] [r=davidkrauser,patviafore]

python-openstackclient was dropped after disco

If we want to create or update builder images post disco we need to migrate to python3-openstackclient

MP: https://code.launchpad.net/~ubuntu-on-ec2/vmbuilder/jenkins_kvm-philroche-eoan-python3-openstackclient/+merge/375547

Show diffs side-by-side

added added

removed removed

Lines of Context:
230
230
esac
231
231
xchroot apt-add-repository -y multiverse
232
232
pkgs+=(ubuntu-snappy-cli
233
 
        python-openstackclient
234
233
        cloud-utils)
 
234
# python-openstackclient was dropped after disco
 
235
case "${suite}" in
 
236
        trusty|xenial|bionic|disco)
 
237
                pkgs+=(python-openstackclient)
 
238
                ;;
 
239
        *)
 
240
                pkgs+=(python3-openstackclient)
 
241
                ;;
 
242
esac
235
243
case "${suite}" in
236
244
        trusty|xenial)
237
245
                pkgs+=(ubuntu-core-security-utils qemu-user-static qemu-user)