Activate the non-iSCSI job for the "check" pipeline

Change-Id: Idcb600a67450d47a94345bb1d0dab497dd58e30e
diff --git a/zuul.d/sp-cinder.yaml b/zuul.d/sp-cinder.yaml
index 48d65de..9b7b8a6 100644
--- a/zuul.d/sp-cinder.yaml
+++ b/zuul.d/sp-cinder.yaml
@@ -23,14 +23,10 @@
         TEMPEST_RUN_VALIDATION: false
         TEMPEST_VOLUME_REVERT_TO_SNAPSHOT: true
         TEMPEST_VOLUME_VENDOR: StorPool
-        # cfg: block
-        # TEMPEST_STORAGE_PROTOCOL: storpool
-        # ENABLE_VOLUME_MULTIATTACH: true
-        # cfg: iscsi
-        TEMPEST_STORAGE_PROTOCOL: iscsi
-        ENABLE_VOLUME_MULTIATTACH: false
         USE_PYTHON3: True
-        # PYTHON3_VERSION: 3.6
+        # cfg: block
+        TEMPEST_STORAGE_PROTOCOL: storpool
+        ENABLE_VOLUME_MULTIATTACH: true
       devstack_local_conf:
         post-config:
           $CINDER_CONF:
@@ -39,17 +35,37 @@
               volume_driver: cinder.volume.drivers.storpool.StorPoolDriver
               storpool_template: virtual
               # enable_unsupported_driver: true
+      tox_envlist: all
+      tempest_test_regex: |
+        volume
+#        (^(tempest\.((api\..*volume)|scenario\.test_encrypted_cinder_volumes|scenario\.test_volume|scenario\.test_shelve_instance))|(cinder_tempest_plugin))
+
+- job:
+    name: cinder-storpool-tempest-iscsi
+    parent: cinder-storpool-tempest
+    vars:
+      devstack_localrc:
+        # cfg: iscsi
+        TEMPEST_STORAGE_PROTOCOL: iscsi
+        ENABLE_VOLUME_MULTIATTACH: false
+      devstack_local_conf:
+        post-config:
+          $CINDER_CONF:
+            storpool:
               # cfg: iscsi
               iscsi_export_to: "\\\\*"
               iscsi_portal_group: pg
-      tox_envlist: all
       tempest_test_regex: |
         ^cinder_tempest_plugin
 #        (^(tempest\.((api\..*volume)|scenario\.test_encrypted_cinder_volumes|scenario\.test_volume|scenario\.test_shelve_instance))|(cinder_tempest_plugin))
 
 - project:
     name: openstack/cinder
-    experimental:
+    check:
       jobs:
         - cinder-storpool-tempest:
             branches: master
+    experimental:
+      jobs:
+        - cinder-storpool-tempest-iscsi:
+            branches: master