From bc53a5388308f21898494251af2ddaee7d3b7304 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Wed, 2 Sep 2015 14:22:45 -0400
Subject: [PATCH] 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
---
 fixtures/scenario001.pp | 8 ++++----
 install_modules.sh      | 7 +++----
 run_tests.sh            | 5 ++++-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/fixtures/scenario001.pp b/fixtures/scenario001.pp
index 37675ae1d..48b91cd2f 100644
--- a/fixtures/scenario001.pp
+++ b/fixtures/scenario001.pp
@@ -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': {
diff --git a/install_modules.sh b/install_modules.sh
index d59df3063..fbc8eece0 100755
--- a/install_modules.sh
+++ b/install_modules.sh
@@ -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
diff --git a/run_tests.sh b/run_tests.sh
index 0ac3ae225..154a4db07 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -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