Move/enable some jobs

Change-Id: Ie00488f3e5e4540dc0f9790b8a7fdd3b2097345f
diff --git a/zuul.d/sp-cinder.yaml b/zuul.d/sp-cinder.yaml
index 0c06831..68f78a1 100644
--- a/zuul.d/sp-cinder.yaml
+++ b/zuul.d/sp-cinder.yaml
@@ -324,16 +324,16 @@
     name: openstack/cinder
     check:
       jobs:
+        - cinder-storpool-tempest:
+            branches: master
         - cinder-storpool-tempest-iscsi-multipath:
             branches: master
     experimental:
       jobs:
-        #- cinder-storpool-tempest-experimental:
-        #    branches: master
+        - cinder-storpool-tempest-experimental:
+            branches: master
         #- cinder-storpool-tempest-iscsi:
         #    branches: master
-        - cinder-storpool-tempest:
-            branches: master
 
 - project:
     name: openstack/os-brick