From 858b128029c7bb994c14427bdb06300d6413619b Mon Sep 17 00:00:00 2001 From: Arx Cruz Date: Fri, 13 Jan 2017 15:46:46 +0100 Subject: [PATCH] Disable TestEncryptedCinderVolumes The right way to configure encrypted volumes is configuring a key manager, like barbican, however, it's not enabled by default, and it's already being covered by one of tripleo scenarios. Change-Id: I3c66733d93e54728547374b4fa2f10be18cae0fd --- roles/validate-tempest/templates/liberty_skip_file.j2 | 4 +++- roles/validate-tempest/templates/master_skip_file.j2 | 3 +++ roles/validate-tempest/templates/mitaka_skip_file.j2 | 3 +++ roles/validate-tempest/templates/newton_skip_file.j2 | 3 +++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/roles/validate-tempest/templates/liberty_skip_file.j2 b/roles/validate-tempest/templates/liberty_skip_file.j2 index 52c5a923e..ea1f17160 100644 --- a/roles/validate-tempest/templates/liberty_skip_file.j2 +++ b/roles/validate-tempest/templates/liberty_skip_file.j2 @@ -3,4 +3,6 @@ -tempest.api.volume.test_volumes_get # rhbz1266947 -tempest.api.identity.*v3 - +# TripleO does not deploy Barbican by default, which is needed for this test to pass +-tempest.scenario.test_encrypted_cinder_volumes.TestEncryptedCinderVolumes.test_encrypted_cinder_volumes_cryptsetup +-tempest.scenario.test_encrypted_cinder_volumes.TestEncryptedCinderVolumes.test_encrypted_cinder_volumes_luks diff --git a/roles/validate-tempest/templates/master_skip_file.j2 b/roles/validate-tempest/templates/master_skip_file.j2 index 46f47b42e..1c1b2a9e6 100644 --- a/roles/validate-tempest/templates/master_skip_file.j2 +++ b/roles/validate-tempest/templates/master_skip_file.j2 @@ -20,3 +20,6 @@ -tempest.api.identity.admin.v2.test_services.ServicesTestJSON #rhbz1380187 -tempest.api.network.test_routers.RoutersIpV6Test.test_add_multiple_router_interfaces +# TripleO does not deploy Barbican by default, which is needed for this test to pass +-tempest.scenario.test_encrypted_cinder_volumes.TestEncryptedCinderVolumes.test_encrypted_cinder_volumes_cryptsetup +-tempest.scenario.test_encrypted_cinder_volumes.TestEncryptedCinderVolumes.test_encrypted_cinder_volumes_luks diff --git a/roles/validate-tempest/templates/mitaka_skip_file.j2 b/roles/validate-tempest/templates/mitaka_skip_file.j2 index a6759c10c..0c6c1b68c 100644 --- a/roles/validate-tempest/templates/mitaka_skip_file.j2 +++ b/roles/validate-tempest/templates/mitaka_skip_file.j2 @@ -7,3 +7,6 @@ -tempest.api.compute.servers.test_attach_interfaces.AttachInterfacesTestJSON.test_add_remove_fixed_ip -tempest.api.network.test_routers.RoutersIpV6Test.test_add_remove_router_interface_with_subnet_id -tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops +# TripleO does not deploy Barbican by default, which is needed for this test to pass +-tempest.scenario.test_encrypted_cinder_volumes.TestEncryptedCinderVolumes.test_encrypted_cinder_volumes_cryptsetup +-tempest.scenario.test_encrypted_cinder_volumes.TestEncryptedCinderVolumes.test_encrypted_cinder_volumes_luks diff --git a/roles/validate-tempest/templates/newton_skip_file.j2 b/roles/validate-tempest/templates/newton_skip_file.j2 index 9dfb781f9..bd6c0a1e2 100644 --- a/roles/validate-tempest/templates/newton_skip_file.j2 +++ b/roles/validate-tempest/templates/newton_skip_file.j2 @@ -11,3 +11,6 @@ -tempest.scenario.test_network_basic_ops.TestNetworkBasicOps # rhbz1386421 -tempest.api.compute.servers.test_server_actions.ServerActionsTestJSON +# TripleO does not deploy Barbican by default, which is needed for this test to pass +-tempest.scenario.test_encrypted_cinder_volumes.TestEncryptedCinderVolumes.test_encrypted_cinder_volumes_cryptsetup +-tempest.scenario.test_encrypted_cinder_volumes.TestEncryptedCinderVolumes.test_encrypted_cinder_volumes_luks