From c3d8e680a46e8abf2ff90444f654e97b7fdb08ec Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Wed, 25 May 2016 14:03:53 -0400
Subject: [PATCH] Align the stars to bring our CI back alive

This patch squash 2 commits to bring our CI back:

1) Pin Tempest to latest working commit:

https://review.openstack.org/#/c/297511/ broke us, we need to pin
Tempest to keep rolling.
This will be reverted once we sort things out.

2) rabbitmq: install packages from distro repos

Stop installing RabbitMQ from rabbitmq.com repository.

rabbitmq.com is providing a terrible and frustrating experience of
packaging repository:
* rabbitmq.com is very often down and we have to recheck our jobs
  everytime it happens.
* packaging signature is currently broken, see [1].

From this patch, we'll deploy RabbitMQ using distro repositories.

[1] https://github.com/puppetlabs/puppetlabs-rabbitmq/pull/476

Change-Id: I1e79c04d7cd796493ae56423b70626e8841cf284
---
 manifests/rabbitmq.pp | 1 +
 run_tests.sh          | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/manifests/rabbitmq.pp b/manifests/rabbitmq.pp
index e828dcfe9..c9bf5b447 100644
--- a/manifests/rabbitmq.pp
+++ b/manifests/rabbitmq.pp
@@ -25,6 +25,7 @@ class openstack_integration::rabbitmq {
       ssl_cert              => $::openstack_integration::params::cert_path,
       ssl_key               => "/etc/rabbitmq/ssl/private/${::fqdn}.pem",
       environment_variables => $::openstack_integration::config::rabbit_env,
+      repos_ensure          => false,
     }
   } else {
     class { '::rabbitmq':
diff --git a/run_tests.sh b/run_tests.sh
index 86642a70a..3b474e8c6 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -198,6 +198,11 @@ TESTS="${TESTS} TestManageQueue"
 
 print_header 'Running Tempest'
 cd /tmp/openstack/tempest
+
+# https://review.openstack.org/#/c/297511/ broke our gate
+# we pin Tempest until we sort this out.
+git checkout a3c7945a5fff6be018de7a56a3faa59acc29f6bc
+
 tox -eall-plugin -- --concurrency=2 $TESTS
 RESULT=$?
 set -e