Merge "Add LVM+tgt tempest job"

.zuul.yaml

@@ -5,17 +5,18 @@
     check:
       jobs:
         - cinder-tempest-plugin-lvm-lio-barbican
+        - cinder-tempest-plugin-lvm-tgt-barbican
         - cinder-tempest-plugin-cbak-ceph
     gate:
       jobs:
         - cinder-tempest-plugin-lvm-lio-barbican
+        - cinder-tempest-plugin-lvm-tgt-barbican
         - cinder-tempest-plugin-cbak-ceph
 
 - job:
-    name: cinder-tempest-plugin-lvm-lio-barbican
+    name: cinder-tempest-plugin-lvm-barbican-base
     description: |
-      This jobs configures Cinder with LVM, LIO, barbican and
-      runs tempest tests and cinderlib tests.
+      This is a base job for lvm with lio & tgt targets
     parent: devstack-tempest
     roles:
       - zuul: opendev.org/openstack/cinderlib
@@ -37,7 +38,6 @@
       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
         CINDER_LVM_TYPE: thin
         CINDER_COORDINATION_URL: 'file://\$state_path'
       devstack_services:
@@ -60,3 +60,20 @@
     vars:
       devstack_services:
         c-bak: true
+
+- job:
+    name: cinder-tempest-plugin-lvm-lio-barbican
+    description: |
+      This jobs configures Cinder with LVM, LIO, barbican and
+      runs tempest tests and cinderlib tests.
+    parent: cinder-tempest-plugin-lvm-barbican-base
+    vars:
+      devstack_localrc:
+        CINDER_ISCSI_HELPER: lioadm
+
+- job:
+    name: cinder-tempest-plugin-lvm-tgt-barbican
+    description: |
+      This jobs configures Cinder with LVM, tgt, barbican and
+      runs tempest tests and cinderlib tests.
+    parent: cinder-tempest-plugin-lvm-barbican-base