From f44ff14f1a89732ab5890f124982555526c5bab5 Mon Sep 17 00:00:00 2001
From: Sofia Enriquez <lsofia.enriquez@gmail.com>
Date: Fri, 3 Apr 2020 20:04:22 +0000
Subject: [PATCH] Create new Ceph job with c-bak service enabled

Currently backup service is disable in Ceph jobs.
In order to solve this cinder-tempest-plugin-cbak-ceph is
defined with the c-bak service enabled.

As a matter of fact the c-bak is redundant incase of lvm job
because the parent job already has enabled the service.

In addition, Tempest provides a blacklist file so that only
storage-relevant tests are executed. Use it instead of the
custom blacklist, which is removed in this patch.

This means that some tests which were previously skipped are
now executed.

If backup tests don't work with the LVM backend, they can be
disabled through the volume_feature_enabled.backup configuration
key.

Co-authored-by: Luigi Toscano <ltoscano@redhat.com>
Change-Id: Id809c37704d4ee741df4333ca01ddd4ec22f33b5
---
 .zuul.yaml            | 18 ++++++++++++++----
 tempest_blacklist.txt | 11 -----------
 2 files changed, 14 insertions(+), 15 deletions(-)
 delete mode 100644 tempest_blacklist.txt

diff --git a/.zuul.yaml b/.zuul.yaml
index b2ede72..e5d692d 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -5,11 +5,11 @@
     check:
       jobs:
         - cinder-tempest-plugin-lvm-lio-barbican
-        - devstack-plugin-ceph-tempest-py3
+        - cinder-tempest-plugin-cbak-ceph
     gate:
       jobs:
         - cinder-tempest-plugin-lvm-lio-barbican
-        - devstack-plugin-ceph-tempest-py3
+        - cinder-tempest-plugin-cbak-ceph
 
 - job:
     name: cinder-tempest-plugin-lvm-lio-barbican
@@ -33,8 +33,8 @@
         devstack_plugins:
           barbican: https://opendev.org/openstack/barbican
     vars:
-      tempest_test_regex: '(^tempest\.(api|scenario\.test_encrypted_cinder_volumes|scenario\.test_volume|scenario\.test_shelve_instance)|(^cinder_tempest_plugin))'
-      tempest_test_blacklist: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/cinder-tempest-plugin'].src_dir }}/tempest_blacklist.txt"
+      tempest_test_regex: '(^tempest\.(api|scenario)|(^cinder_tempest_plugin))'
+      tempest_test_blacklist: '{{ ansible_user_dir }}/{{ zuul.projects["opendev.org/openstack/tempest"].src_dir }}/tools/tempest-integrated-gate-storage-blacklist.txt'
       tox_envlist: all
       devstack_localrc:
         CINDER_ISCSI_HELPER: lioadm
@@ -50,3 +50,13 @@
       - ^.*\.rst$
       - ^doc/.*$
       - ^releasenotes/.*$
+
+- job:
+    name: cinder-tempest-plugin-cbak-ceph
+    parent: devstack-plugin-ceph-tempest-py3
+    description: |
+      Integration tests that runs with the ceph devstack plugin, py3
+      and enable the backup service.
+    vars:
+      devstack_services:
+        c-bak: true
diff --git a/tempest_blacklist.txt b/tempest_blacklist.txt
deleted file mode 100644
index d68709f..0000000
--- a/tempest_blacklist.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-.*VolumesSnapshotTestJSON.test_snapshot_backup
-.*VolumesBackupsAdminTest.test_volume_backup_export_import
-.*VolumesBackupsAdminTest.test_volume_backup_reset_status
-.*VolumesBackupsTest.test_backup_create_attached_volume
-.*VolumesBackupsTest.test_backup_create_and_restore_to_an_existing_volume
-.*VolumesBackupsTest.test_bootable_volume_backup_and_restore
-.*VolumesBackupsTest.test_incremental_backup
-.*VolumesBackupsTest.test_volume_backup_create_get_detailed_list_restore_delete
-.*VolumesBackupsTest.test_volume_snapshot_backup
-.*VolumesBackupsV39Test.test_update_backup
-.*TestVolumeBackupRestore.test_volume_backup_restore