From bf7e86a1ff980ad5c87c92839fc129552c154ccc Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Tue, 30 Aug 2016 12:09:34 -0400
Subject: [PATCH] Revert "Revert "run_tests: disable TestEncryptedCinderVolumes
 tests""

This patch broke us:
https://github.com/openstack/cinder/commit/993ba893cae0372fcaa14cf970871f8dabad6455

Until we fix it, let's disable the tests.

This reverts commit dfa7e5625452f5fc24f05e5ba9c95f70fcf7644e.

Change-Id: I988dc7c742fe7669386aec8701ffce4d22f0bcd6
---
 run_tests.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/run_tests.sh b/run_tests.sh
index 0f022708e..243421e97 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -197,7 +197,10 @@ TESTS="${TESTS} api.baremetal.admin.test_drivers"
 TESTS="${TESTS} TestManageQueue"
 
 # Cinder encrypted volumes
-TESTS="${TESTS} TestEncryptedCinderVolumes"
+# TODO(emilien) re-enable it when those 2 patches are merged:
+# - https://review.openstack.org/#/c/358670/
+# - https://review.openstack.org/#/c/359391/
+# TESTS="${TESTS} TestEncryptedCinderVolumes"
 
 print_header 'Running Tempest'
 cd /tmp/openstack/tempest