From 427f6dda0a45a0bc4f60a627921597ef1dc4c89f Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Tue, 7 Jun 2016 14:52:46 -0400
Subject: [PATCH] Align the stars to deploy latest OpenStack on June 7th

* Pin Tempest on Ubuntu. Latest Mitaka release on Xenial broke Tempest
  tests.
* Bump RDO to latest repo so we can test Octavia & also unpin Tempest
  (Ceilometer Tempest tests were broken).
* Unpin Tempest for centos7 jobs.

Change-Id: Id550290bf9ebb2c6190072b3e8a4c501f535b2d5
---
 manifests/repos.pp | 2 +-
 run_tests.sh       | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/manifests/repos.pp b/manifests/repos.pp
index be1826c2f..b6eb9180b 100644
--- a/manifests/repos.pp
+++ b/manifests/repos.pp
@@ -24,7 +24,7 @@ class openstack_integration::repos {
         manage_epel => false,
         repo_hash   => {
           'newton-current'       => {
-            'baseurl'  => 'https://trunk.rdoproject.org/centos7-master/37/b3/37b3d1d6eedadfd0a7e0496f0cfe9c4fe345006b_f558a9b0/',
+            'baseurl'  => 'https://trunk.rdoproject.org/centos7-master/46/92/4692a339455c1921a8867f5fdf1c0d6ad1e36632_4bd3bb8f/',
             'descr'    => 'Newton current',
             'gpgcheck' => 'no',
             'priority' => 1,
diff --git a/run_tests.sh b/run_tests.sh
index 2e7ba1e03..ff668828c 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -214,9 +214,11 @@ TESTS="${TESTS} TestManageQueue"
 print_header 'Running Tempest'
 cd /tmp/openstack/tempest
 
-# see context:
-# https://review.openstack.org/#/c/325520/
-git checkout c9e37ae50f8f87bb39d64295bfd40c515b4edeba
+if uses_debs; then
+    # TODO: we need to find why tempest tests fail when running
+    # latest Ubuntu Mitaka on Xenial and recent Tempest.
+    git checkout c9e37ae50f8f87bb39d64295bfd40c515b4edeba
+fi
 
 tox -eall-plugin -- --concurrency=2 $TESTS
 RESULT=$?