acceptance: bump trusty packaging to trusty-proposed/liberty

Since our recent discussion about Ubuntu packaging, we decided to bump
Ubuntu packaging to trusty-proposed/liberty so we can install Liberty in
a better shape than current situation (Staging repo).

This patch installs UCA liberty repository.
It also makes sure `apt-get update` ran before so we are able to install
ubuntu-cloud-keyring package in the gate.

Change-Id: I57e2ddc5d0e228142f8045623ffbde362c0e7f7b
This commit is contained in:
Emilien Macchi 2015-09-02 14:22:45 -04:00
parent 95f69957db
commit bc53a53883
3 changed files with 11 additions and 9 deletions

View File

@ -20,11 +20,11 @@ Exec { logoutput => 'on_failure' }
case $::osfamily {
'Debian': {
include ::apt
apt::ppa { 'ppa:ubuntu-cloud-archive/liberty-staging':
# it's false by default in 2.x series but true in 1.8.x
package_manage => false,
class { '::openstack_extras::repo::debian::ubuntu':
release => 'liberty',
repo => 'proposed',
package_require => true,
}
Exec['apt_update'] -> Package<||>
$package_provider = 'apt'
}
'RedHat': {

View File

@ -53,9 +53,8 @@ fi
puppet module list
# TODO(emilien) drop that code once Ubuntu Liberty packaging is fixed
if type "apt-get" 2>/dev/null; then
sudo add-apt-repository -y ppa:ubuntu-cloud-archive/liberty-staging
sudo apt-get update
sudo apt-get install -y python-pymysql
# apt-get update needs to be run to be able (later) to install
# ubuntu-cloud-keyring package with puppet
/usr/bin/apt-get update
fi

View File

@ -57,4 +57,7 @@ if [ $RESULT -ne 0 ]; then
exit 1
fi
cd /tmp/openstack/tempest; tox -eall -- identity image
# TODO(emilien) the checkout thing is temporary, while test_list_projects_returns_only_authorized_projects is
# failing for us we checkout the most recent commit without this test.
# https://bugs.launchpad.net/tempest/+bug/1492419
cd /tmp/openstack/tempest; git checkout b6369eaa58f2c9ce334863cb3ba54c5656cf64c4; tox -eall -- identity image