From 836e13cd5785a9614bcddb98ee2b7367a3dc8541 Mon Sep 17 00:00:00 2001
From: Lee Yarwood <lyarwood@redhat.com>
Date: Fri, 27 Nov 2020 09:10:51 +0000
Subject: [PATCH] zuul: Skip test_attach_scsi_disk_with_config_drive in
 nova-ceph-multistore

Related-Bug: #1905725
Change-Id: Ia108a7ac04defe742efcac09e7c0d61b08ab4e6d
---
 .zuul.yaml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 61f164f9c40b..1928fd78a141 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -379,7 +379,11 @@
       # NOTE(danms): These tests create an empty non-raw image, which nova
       # will refuse because we set never_download_image_if_on_rbd in this job.
       # Just skip these tests for this case.
-      tempest_black_regex: .*encrypted_cinder_volumes.*
+      # FIXME(lyarwood): test_attach_scsi_disk_with_config_drive attempts to
+      # delete an image that has been cloned by nova ahead of the instance
+      # being removed. Skip this test until it is reworked to remove the server
+      # ahead of the image.
+      tempest_black_regex: .*encrypted_cinder_volumes.*|.*test_attach_scsi_disk_with_config_drive
       devstack_localrc:
         GLANCE_STANDALONE: True
         GLANCE_USE_IMPORT_WORKFLOW: True