Revert "Disable projects temporarily"

This reverts commit 8749a6de7896be1ec096c9de94e39c4b39c22c2c.

Change-Id: I39f600dd77fca6ff652a264a46199c3fd691e061
diff --git a/zuul.d/sp-cinder.yaml b/zuul.d/sp-cinder.yaml
index 9edea2b..7119f3d 100644
--- a/zuul.d/sp-cinder.yaml
+++ b/zuul.d/sp-cinder.yaml
@@ -29,446 +29,446 @@
 ###
 # Copied from upstream, where it has been removed
 
-#- job:
-#    name: tempest-full
-#    parent: devstack-tempest
-#    description: |
-#      Base integration test with Neutron networking and py27.
-#      This job is supposed to run until stable/train setup only.
-#      If you are running it on stable/ussuri gate onwards for python2.7
-#      coverage then you need to do override-checkout with any stable
-#      branch less than or equal to stable/train.
-#      Former names for this job where:
-#        * legacy-tempest-dsvm-neutron-full
-#        * gate-tempest-dsvm-neutron-full-ubuntu-xenial
-#    vars:
-#      tox_envlist: full
-#      devstack_localrc:
-#        ENABLE_FILE_INJECTION: true
-#        ENABLE_VOLUME_MULTIATTACH: true
-#        USE_PYTHON3: False
-#      devstack_services:
-#        # NOTE(mriedem): Disable the cinder-backup service from tempest-full
-#        # since tempest-full is in the integrated-gate project template but
-#        # the backup tests do not really involve other services so they should
-#        # be run in some more cinder-specific job, especially because the
-#        # tests fail at a high rate (see bugs 1483434, 1813217, 1745168)
-#        c-bak: false
-#
-####
-#
-#- job:
-#    name: cinder-storpool-tempest
-#    parent: tempest-full
-#    pre-run:
-#      - playbooks/workarounds/01-disable-unattended-upgrades.yaml
-#      - playbooks/workarounds/02-install-linux-modules-extra-for-z3fold.yaml
-#      - playbooks/sp-init.yaml
-#      - playbooks/setup-openstack-client/pre.yaml
-#      - playbooks/setup-openstack-storpool/pre.yaml
-#    run: playbooks/tempest-and-cinderlib-run.yaml
-#    cleanup-run:
-#      - playbooks/setup-openstack-storpool/post.yaml
-#      - playbooks/setup-openstack-client/post.yaml
-#      - playbooks/sp-cleanup.yaml
-#    required-projects:
-#      - opendev.org/openstack/cinderlib
-#      - opendev.org/openstack/os-brick
-#      - opendev.org/openstack/tempest
-#      - opendev.org/openstack/cinder-tempest-plugin
-#      # - config
-#      - sp-osci
-#    timeout: 10800
-#    nodeset: ubuntu2204-openstack-multi-node-mixed
-#    secrets:
-#      # openstack-client
-#      - name: OPENSTACK_DATA
-#        secret: OPENSTACK_DATA
-#      - name: RESOLVED_DATA
-#        secret: RESOLVED_DATA
-#
-#      # openstack-iscsi-multipath-storpool
-#      - name: STORPOOL_DEPLOY_KEY
-#        secret: STORPOOL_DEPLOY_KEY
-#      - name: STORPOOL_DEPLOY_KEY_PUB
-#        secret: STORPOOL_DEPLOY_KEY_PUB
-#      - name: STORPOOL_BLOCK_INVENTORY
-#        secret: STORPOOL_BLOCK_INVENTORY
-#      - name: STORPOOL_ISCSI_NETPLAN
-#        secret: STORPOOL_ISCSI_NETPLAN
-#      - name: STORPOOL_STORPOOL_NETPLAN
-#        secret: STORPOOL_STORPOOL_NETPLAN
-#      - name: STORPOOL_NETPLAN_SERVICE
-#        secret: STORPOOL_NETPLAN_SERVICE
-#      - name: STORPOOL_CONF_BLOCK
-#        secret: STORPOOL_CONF_BLOCK
-#      - name: STORPOOL_DEPLOY
-#        secret: STORPOOL_DEPLOY
-#      - name: STORPOOL_DEPLOY_INFO_CONF
-#        secret: STORPOOL_DEPLOY_INFO_CONF
-#      - name: STORPOOL_CONF_ISCSI_NODE
-#        secret: STORPOOL_CONF_ISCSI_NODE
-#      - name: ISCSI_NODE_SYSTEMD_NETWORKD
-#        secret: ISCSI_NODE_SYSTEMD_NETWORKD
-#    vars:
-#      os_venv: "~/sp-venv-openstack"
-#      storpool_connection: "block"
-#      sp_target_release: "release"
-#
-#      do_storprep: true
-#      devstack_localrc:
-#        CINDER_ENABLED_BACKENDS: storpool:storpool
-#        # CINDER_ISCSI_HELPER: tgtadm
-#        ENABLE_FILE_INJECTION: false
-#        TEMPEST_CONCURRENCY: 2
-#        TEMPEST_EXTEND_ATTACHED_VOLUME: true
-#        TEMPEST_PLUGINS: cinder-tempest-plugin
-#        TEMPEST_RUN_VALIDATION: false
-#        TEMPEST_VOLUME_REVERT_TO_SNAPSHOT: true
-#        TEMPEST_VOLUME_VENDOR: StorPool
-#        USE_PYTHON3: True
-#        # cfg: block
-#        TEMPEST_STORAGE_PROTOCOL: storpool
-#        ENABLE_VOLUME_MULTIATTACH: true
-#      devstack_local_conf:
-#        test-config:
-#          $TEMPEST_CONFIG:
-#            validation:
-#              run_validation: true
-#        post-config:
-#          $CINDER_CONF:
-#            storpool:
-#              volume_backend_name: storpool
-#              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-testing
-#    parent: cinder-storpool-tempest
-#    vars:
-#      sp_target_release: "testing"
-#
-#
-#- job:
-#    name: cinder-storpool-tempest-experimental
-#    parent: cinder-storpool-tempest
-#    vars:
-#      sp_experimental: true
-#
-#- job:
-#    name: cinder-storpool-tempest-iscsi
-#    parent: cinder-storpool-tempest
-#    vars:
-#      sp_experimental: true
-#      do_storprep: true
-#      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
-#              use_multipath_for_image_xfer: True
-#          $NOVA_CONF:
-#            libvirt:
-#              # cfg: iscsi
-#              volume_use_multipath: True
-#      tempest_test_regex: |
-#        volume|^cinder_tempest_plugin
-##        ^cinder_tempest_plugin
-##        (^(tempest\.((api\..*volume)|scenario\.test_encrypted_cinder_volumes|scenario\.test_volume|scenario\.test_shelve_instance))|(cinder_tempest_plugin))
-#
-#- job:
-#    name: cinder-storpool-tempest-iscsi-multipath-parent
-#    parent: tempest-full
-#    pre-run:
-#      - playbooks/workarounds/01-disable-unattended-upgrades.yaml
-#      - playbooks/workarounds/02-install-linux-modules-extra-for-z3fold.yaml
-#      - playbooks/sp-init.yaml
-#      - playbooks/setup-openstack-client/pre.yaml
-#      - playbooks/setup-openstack-iscsi-multipath/pre.yaml
-#      - playbooks/setup-openstack-storpool/pre.yaml
-#    run: playbooks/tempest-and-cinderlib-run.yaml
-#    cleanup-run:
-#      - playbooks/setup-openstack-storpool/post.yaml
-#      - playbooks/setup-openstack-iscsi-multipath/post.yaml
-#      - playbooks/setup-openstack-client/post.yaml
-#      - playbooks/sp-cleanup.yaml
-#    required-projects:
-#      - opendev.org/openstack/cinderlib
-#      - opendev.org/openstack/os-brick
-#      - opendev.org/openstack/tempest
-#      - opendev.org/openstack/cinder-tempest-plugin
-#      # - config
-#      - sp-osci
-#    timeout: 10800
-#    nodeset: ubuntu2204-openstack-multi-node-mixed
-#    attempts: 1
-#    secrets:
-#      # openstack-client
-#      - name: OPENSTACK_DATA
-#        secret: OPENSTACK_DATA
-#      - name: RESOLVED_DATA
-#        secret: RESOLVED_DATA
-#
-#      # openstack-iscsi-multipath-storpool
-#      - name: STORPOOL_DEPLOY_KEY
-#        secret: STORPOOL_DEPLOY_KEY
-#      - name: STORPOOL_DEPLOY_KEY_PUB
-#        secret: STORPOOL_DEPLOY_KEY_PUB
-#      - name: STORPOOL_BLOCK_INVENTORY
-#        secret: STORPOOL_BLOCK_INVENTORY
-#      - name: STORPOOL_ISCSI_INVENTORY
-#        secret: STORPOOL_ISCSI_INVENTORY
-#      - name: STORPOOL_ISCSI_NETPLAN
-#        secret: STORPOOL_ISCSI_NETPLAN
-#      - name: STORPOOL_STORPOOL_NETPLAN
-#        secret: STORPOOL_STORPOOL_NETPLAN
-#      - name: STORPOOL_NETPLAN_SERVICE
-#        secret: STORPOOL_NETPLAN_SERVICE
-#      - name: STORPOOL_CONF_ISCSI
-#        secret: STORPOOL_CONF_ISCSI
-#      - name: STORPOOL_DEPLOY
-#        secret: STORPOOL_DEPLOY
-#      - name: STORPOOL_DEPLOY_INFO_CONF
-#        secret: STORPOOL_DEPLOY_INFO_CONF
-#      - name: STORPOOL_CONF_ISCSI_NODE
-#        secret: STORPOOL_CONF_ISCSI_NODE
-#      - name: ISCSI_NODE_SYSTEMD_NETWORKD
-#        secret: ISCSI_NODE_SYSTEMD_NETWORKD
-#
-#    vars:
-#      os_venv: "~/sp-venv-openstack"
-#      storpool_connection: "iscsi"
-#      sp_target_release: "release"
-#
-#      zuul_copy_output:
-#        /etc/multipath.conf: logs_txt
-#        /etc/iscsi/iscsid.conf: logs_txt
-#      devstack_localrc:
-#        CINDER_ENABLED_BACKENDS: storpool:storpool
-#        # CINDER_ISCSI_HELPER: tgtadm
-#        ENABLE_FILE_INJECTION: false
-#        TEMPEST_CONCURRENCY: 2
-#        TEMPEST_EXTEND_ATTACHED_VOLUME: true
-#        TEMPEST_PLUGINS: cinder-tempest-plugin
-#        TEMPEST_RUN_VALIDATION: false
-#        TEMPEST_VOLUME_REVERT_TO_SNAPSHOT: true
-#        TEMPEST_VOLUME_VENDOR: StorPool
-#        USE_PYTHON3: True
-#        # cfg: block
-#        TEMPEST_STORAGE_PROTOCOL: storpool
-#        ENABLE_VOLUME_MULTIATTACH: true
-#      devstack_local_conf:
-#        test-config:
-#          $TEMPEST_CONFIG:
-#            validation:
-#              run_validation: true
-#        post-config:
-#          $CINDER_CONF:
-#            storpool:
-#              volume_backend_name: storpool
-#              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-multipath
-#    parent: cinder-storpool-tempest-iscsi-multipath-parent
-#    vars:
-#      sp_experimental: true
-#      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
-#              use_multipath_for_image_xfer: True
-#          $NOVA_CONF:
-#            libvirt:
-#              # cfg: iscsi
-#              volume_use_multipath: True
-#      tempest_test_regex: |
-#        volume|^cinder_tempest_plugin
-##        ^cinder_tempest_plugin
-##        (^(tempest\.((api\..*volume)|scenario\.test_encrypted_cinder_volumes|scenario\.test_volume|scenario\.test_shelve_instance))|(cinder_tempest_plugin))
-#
-#
-#- job:
-#    name: cinder-storpool-tempest-iscsi-multipath-testing
-#    parent: cinder-storpool-tempest-iscsi-multipath
-#    vars:
-#      sp_target_release: "testing"
-#
-#
-#- job:
-#    name: kolla-cinder-storpool-tempest-iscsi-multipath
-#    pre-run:
-#      - playbooks/workarounds/01-disable-unattended-upgrades.yaml
-#      - playbooks/setup-openstack-client/pre.yaml
-#      - playbooks/setup-openstack-iscsi-multipath/pre.yaml
-#      - playbooks/setup-openstack-storpool/pre.yaml
-#      - playbooks/kolla-setup-openstack-iscsi-multipath-storpool/pre.yaml
-#    run: playbooks/kolla-setup-openstack-iscsi-multipath-storpool/run.yaml
-#    cleanup-run:
-#      - playbooks/kolla-setup-openstack-iscsi-multipath-storpool/post.yaml
-#      - playbooks/setup-openstack-storpool/post.yaml
-#      - playbooks/setup-openstack-iscsi-multipath/post.yaml
-#      - playbooks/setup-openstack-client/post.yaml
-#    required-projects:
-#      - opendev.org/openstack/tempest
-#    timeout: 10800
-#    nodeset: ubuntu2204-openstack-multi-node-mixed
-#    attempts: 1
-#    secrets:
-#      # openstack-client
-#      - name: OPENSTACK_DATA
-#        secret: OPENSTACK_DATA
-#      - name: RESOLVED_DATA
-#        secret: RESOLVED_DATA
-#
-#      # openstack-iscsi-multipath-storpool
-#      - name: STORPOOL_DEPLOY_KEY
-#        secret: STORPOOL_DEPLOY_KEY
-#      - name: STORPOOL_DEPLOY_KEY_PUB
-#        secret: STORPOOL_DEPLOY_KEY_PUB
-#      - name: STORPOOL_DEPLOY
-#        secret: STORPOOL_DEPLOY
-#      - name: STORPOOL_DEPLOY_INFO_CONF
-#        secret: STORPOOL_DEPLOY_INFO_CONF
-#      - name: STORPOOL_ISCSI_INVENTORY
-#        secret: STORPOOL_ISCSI_INVENTORY
-#      - name: STORPOOL_ISCSI_NETPLAN
-#        secret: STORPOOL_ISCSI_NETPLAN
-#      - name: STORPOOL_STORPOOL_NETPLAN
-#        secret: STORPOOL_STORPOOL_NETPLAN
-#      - name: STORPOOL_NETPLAN_SERVICE
-#        secret: STORPOOL_NETPLAN_SERVICE
-#      - name: STORPOOL_CONF_ISCSI
-#        secret: STORPOOL_CONF_ISCSI
-#      - name: STORPOOL_CONF_ISCSI_NODE
-#        secret: STORPOOL_CONF_ISCSI_NODE
-#      - name: ISCSI_NODE_SYSTEMD_NETWORKD
-#        secret: ISCSI_NODE_SYSTEMD_NETWORKD
-#    vars:
-#      os_venv: "~/sp-venv-openstack"
-#      storpool_connection: "iscsi"
-#      sp_target_release: "release"
-#
-#      zuul_copy_output:
-#        /etc/multipath.conf: logs_txt
-#        /etc/iscsi/iscsid.conf: logs_txt
-#
-#      tempest_test_regex: volume
-#
-#- job:
-#    name: kolla-cinder-storpool-tempest-iscsi-multipath-zed-ubuntu-jammy-pre-release
-#    parent: kolla-cinder-storpool-tempest-iscsi-multipath
-#    vars:
-#      sp_target_release: "release"
-#
-#      kolla_ansible_version: "16.2.0"
-#      kolla_openstack_release: "zed"
-#      enable_cinder_backend_storpool: "yes"
-#      kolla_nova_compute_image_full: "cts.storpool.com/kolla/ubuntu-binary-nova-compute:zed-ubuntu-jammy-pre-release"
-#      kolla_cinder_volume_image_full: "cts.storpool.com/kolla/ubuntu-binary-cinder-volume:zed-ubuntu-jammy-pre-release"
-#      kolla_glance_api_image_full: "quay.io/openstack.kolla/glance-api:zed-ubuntu-jammy"
-#
-#- job:
-#    name: kolla-cinder-tempest-iscsi-multipath-2023.2-ubuntu-jammy-lvm-reference
-#    parent: kolla-cinder-storpool-tempest-iscsi-multipath
-#    vars:
-#      sp_target_release: "release"
-#
-#      kolla_ansible_version: "stable/2023.2"
-#      kolla_openstack_release: "2023.2"
-#      enable_cinder_backend_storpool: "no"
-#      kolla_nova_compute_image_full: "quay.io/openstack.kolla/nova-compute:2023.2-ubuntu-jammy"
-#      kolla_cinder_volume_image_full: "quay.io/openstack.kolla/cinder-volume:2023.2-ubuntu-jammy"
-#      kolla_glance_api_image_full: "quay.io/openstack.kolla/glance-api:2023.2-ubuntu-jammy"
-#
-#- job:
-#    name: kolla-cinder-storpool-tempest-iscsi-multipath-2023.2-ubuntu-jammy-pre-release
-#    parent: kolla-cinder-storpool-tempest-iscsi-multipath
-#    vars:
-#      sp_target_release: "release"
-#
-#      kolla_ansible_version: "stable/2023.2"
-#      kolla_openstack_release: "2023.2"
-#      enable_cinder_backend_storpool: "yes"
-#      kolla_nova_compute_image_full: "cts.storpool.com/kolla/ubuntu-binary-nova-compute:2023.2-ubuntu-jammy-pre-release"
-#      kolla_cinder_volume_image_full: "cts.storpool.com/kolla/ubuntu-binary-cinder-volume:2023.2-ubuntu-jammy-pre-release"
-#      kolla_glance_api_image_full: "cts.storpool.com/kolla/ubuntu-binary-glance-api:2023.2-ubuntu-jammy-pre-release"
-#
-#- job:
-#    name: kolla-cinder-storpool-tempest-iscsi-multipath-testing
-#    parent: kolla-cinder-storpool-tempest-iscsi-multipath
-#    vars:
-#      sp_target_release: "testing"
-#
-#      kolla_ansible_version: "16.2.0"
-#      kolla_openstack_release: "zed"
-#      enable_cinder_backend_storpool: "yes"
-#      kolla_nova_compute_image_full: "cts.storpool.com/kolla/ubuntu-binary-nova-compute:zed-ubuntu-jammy"
-#      kolla_cinder_volume_image_full: "cts.storpool.com/kolla/ubuntu-binary-cinder-volume:zed-ubuntu-jammy"
-#      kolla_glance_api_image_full: "quay.io/openstack.kolla/glance-api:2023.2-ubuntu-jammy"
-#
-#- project:
-#    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-iscsi:
-#        #    branches: master
-#
-#- project:
-#    name: openstack/os-brick
-#    check:
-#      jobs:
-#        - cinder-storpool-tempest:
-#            branches: master
-#
-#- project:
-#    name: kolla-experiments
-#    check:
-#      jobs:
-#        - kolla-cinder-tempest-iscsi-multipath-2023.2-ubuntu-jammy-lvm-reference:
-#            branches: master
-#        - kolla-cinder-storpool-tempest-iscsi-multipath-2023.2-ubuntu-jammy-pre-release:
-#            branches: master
-#
-#- project:
-#    name: storpool-experiments
-#    check:
-#      jobs:
-#        - cinder-storpool-tempest-testing:
-#            branches: master
-#        - cinder-storpool-tempest-iscsi-multipath-testing:
-#            branches: master
-#        - kolla-cinder-storpool-tempest-iscsi-multipath-testing:
-#            branches: master
+- job:
+    name: tempest-full
+    parent: devstack-tempest
+    description: |
+      Base integration test with Neutron networking and py27.
+      This job is supposed to run until stable/train setup only.
+      If you are running it on stable/ussuri gate onwards for python2.7
+      coverage then you need to do override-checkout with any stable
+      branch less than or equal to stable/train.
+      Former names for this job where:
+        * legacy-tempest-dsvm-neutron-full
+        * gate-tempest-dsvm-neutron-full-ubuntu-xenial
+    vars:
+      tox_envlist: full
+      devstack_localrc:
+        ENABLE_FILE_INJECTION: true
+        ENABLE_VOLUME_MULTIATTACH: true
+        USE_PYTHON3: False
+      devstack_services:
+        # NOTE(mriedem): Disable the cinder-backup service from tempest-full
+        # since tempest-full is in the integrated-gate project template but
+        # the backup tests do not really involve other services so they should
+        # be run in some more cinder-specific job, especially because the
+        # tests fail at a high rate (see bugs 1483434, 1813217, 1745168)
+        c-bak: false
+
+###
+
+- job:
+    name: cinder-storpool-tempest
+    parent: tempest-full
+    pre-run:
+      - playbooks/workarounds/01-disable-unattended-upgrades.yaml
+      - playbooks/workarounds/02-install-linux-modules-extra-for-z3fold.yaml
+      - playbooks/sp-init.yaml
+      - playbooks/setup-openstack-client/pre.yaml
+      - playbooks/setup-openstack-storpool/pre.yaml
+    run: playbooks/tempest-and-cinderlib-run.yaml
+    cleanup-run:
+      - playbooks/setup-openstack-storpool/post.yaml
+      - playbooks/setup-openstack-client/post.yaml
+      - playbooks/sp-cleanup.yaml
+    required-projects:
+      - opendev.org/openstack/cinderlib
+      - opendev.org/openstack/os-brick
+      - opendev.org/openstack/tempest
+      - opendev.org/openstack/cinder-tempest-plugin
+      # - config
+      - sp-osci
+    timeout: 10800
+    nodeset: ubuntu2204-openstack-multi-node-mixed
+    secrets:
+      # openstack-client
+      - name: OPENSTACK_DATA
+        secret: OPENSTACK_DATA
+      - name: RESOLVED_DATA
+        secret: RESOLVED_DATA
+
+      # openstack-iscsi-multipath-storpool
+      - name: STORPOOL_DEPLOY_KEY
+        secret: STORPOOL_DEPLOY_KEY
+      - name: STORPOOL_DEPLOY_KEY_PUB
+        secret: STORPOOL_DEPLOY_KEY_PUB
+      - name: STORPOOL_BLOCK_INVENTORY
+        secret: STORPOOL_BLOCK_INVENTORY
+      - name: STORPOOL_ISCSI_NETPLAN
+        secret: STORPOOL_ISCSI_NETPLAN
+      - name: STORPOOL_STORPOOL_NETPLAN
+        secret: STORPOOL_STORPOOL_NETPLAN
+      - name: STORPOOL_NETPLAN_SERVICE
+        secret: STORPOOL_NETPLAN_SERVICE
+      - name: STORPOOL_CONF_BLOCK
+        secret: STORPOOL_CONF_BLOCK
+      - name: STORPOOL_DEPLOY
+        secret: STORPOOL_DEPLOY
+      - name: STORPOOL_DEPLOY_INFO_CONF
+        secret: STORPOOL_DEPLOY_INFO_CONF
+      - name: STORPOOL_CONF_ISCSI_NODE
+        secret: STORPOOL_CONF_ISCSI_NODE
+      - name: ISCSI_NODE_SYSTEMD_NETWORKD
+        secret: ISCSI_NODE_SYSTEMD_NETWORKD
+    vars:
+      os_venv: "~/sp-venv-openstack"
+      storpool_connection: "block"
+      sp_target_release: "release"
+
+      do_storprep: true
+      devstack_localrc:
+        CINDER_ENABLED_BACKENDS: storpool:storpool
+        # CINDER_ISCSI_HELPER: tgtadm
+        ENABLE_FILE_INJECTION: false
+        TEMPEST_CONCURRENCY: 2
+        TEMPEST_EXTEND_ATTACHED_VOLUME: true
+        TEMPEST_PLUGINS: cinder-tempest-plugin
+        TEMPEST_RUN_VALIDATION: false
+        TEMPEST_VOLUME_REVERT_TO_SNAPSHOT: true
+        TEMPEST_VOLUME_VENDOR: StorPool
+        USE_PYTHON3: True
+        # cfg: block
+        TEMPEST_STORAGE_PROTOCOL: storpool
+        ENABLE_VOLUME_MULTIATTACH: true
+      devstack_local_conf:
+        test-config:
+          $TEMPEST_CONFIG:
+            validation:
+              run_validation: true
+        post-config:
+          $CINDER_CONF:
+            storpool:
+              volume_backend_name: storpool
+              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-testing
+    parent: cinder-storpool-tempest
+    vars:
+      sp_target_release: "testing"
+
+
+- job:
+    name: cinder-storpool-tempest-experimental
+    parent: cinder-storpool-tempest
+    vars:
+      sp_experimental: true
+
+- job:
+    name: cinder-storpool-tempest-iscsi
+    parent: cinder-storpool-tempest
+    vars:
+      sp_experimental: true
+      do_storprep: true
+      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
+              use_multipath_for_image_xfer: True
+          $NOVA_CONF:
+            libvirt:
+              # cfg: iscsi
+              volume_use_multipath: True
+      tempest_test_regex: |
+        volume|^cinder_tempest_plugin
+#        ^cinder_tempest_plugin
+#        (^(tempest\.((api\..*volume)|scenario\.test_encrypted_cinder_volumes|scenario\.test_volume|scenario\.test_shelve_instance))|(cinder_tempest_plugin))
+
+- job:
+    name: cinder-storpool-tempest-iscsi-multipath-parent
+    parent: tempest-full
+    pre-run:
+      - playbooks/workarounds/01-disable-unattended-upgrades.yaml
+      - playbooks/workarounds/02-install-linux-modules-extra-for-z3fold.yaml
+      - playbooks/sp-init.yaml
+      - playbooks/setup-openstack-client/pre.yaml
+      - playbooks/setup-openstack-iscsi-multipath/pre.yaml
+      - playbooks/setup-openstack-storpool/pre.yaml
+    run: playbooks/tempest-and-cinderlib-run.yaml
+    cleanup-run:
+      - playbooks/setup-openstack-storpool/post.yaml
+      - playbooks/setup-openstack-iscsi-multipath/post.yaml
+      - playbooks/setup-openstack-client/post.yaml
+      - playbooks/sp-cleanup.yaml
+    required-projects:
+      - opendev.org/openstack/cinderlib
+      - opendev.org/openstack/os-brick
+      - opendev.org/openstack/tempest
+      - opendev.org/openstack/cinder-tempest-plugin
+      # - config
+      - sp-osci
+    timeout: 10800
+    nodeset: ubuntu2204-openstack-multi-node-mixed
+    attempts: 1
+    secrets:
+      # openstack-client
+      - name: OPENSTACK_DATA
+        secret: OPENSTACK_DATA
+      - name: RESOLVED_DATA
+        secret: RESOLVED_DATA
+
+      # openstack-iscsi-multipath-storpool
+      - name: STORPOOL_DEPLOY_KEY
+        secret: STORPOOL_DEPLOY_KEY
+      - name: STORPOOL_DEPLOY_KEY_PUB
+        secret: STORPOOL_DEPLOY_KEY_PUB
+      - name: STORPOOL_BLOCK_INVENTORY
+        secret: STORPOOL_BLOCK_INVENTORY
+      - name: STORPOOL_ISCSI_INVENTORY
+        secret: STORPOOL_ISCSI_INVENTORY
+      - name: STORPOOL_ISCSI_NETPLAN
+        secret: STORPOOL_ISCSI_NETPLAN
+      - name: STORPOOL_STORPOOL_NETPLAN
+        secret: STORPOOL_STORPOOL_NETPLAN
+      - name: STORPOOL_NETPLAN_SERVICE
+        secret: STORPOOL_NETPLAN_SERVICE
+      - name: STORPOOL_CONF_ISCSI
+        secret: STORPOOL_CONF_ISCSI
+      - name: STORPOOL_DEPLOY
+        secret: STORPOOL_DEPLOY
+      - name: STORPOOL_DEPLOY_INFO_CONF
+        secret: STORPOOL_DEPLOY_INFO_CONF
+      - name: STORPOOL_CONF_ISCSI_NODE
+        secret: STORPOOL_CONF_ISCSI_NODE
+      - name: ISCSI_NODE_SYSTEMD_NETWORKD
+        secret: ISCSI_NODE_SYSTEMD_NETWORKD
+
+    vars:
+      os_venv: "~/sp-venv-openstack"
+      storpool_connection: "iscsi"
+      sp_target_release: "release"
+
+      zuul_copy_output:
+        /etc/multipath.conf: logs_txt
+        /etc/iscsi/iscsid.conf: logs_txt
+      devstack_localrc:
+        CINDER_ENABLED_BACKENDS: storpool:storpool
+        # CINDER_ISCSI_HELPER: tgtadm
+        ENABLE_FILE_INJECTION: false
+        TEMPEST_CONCURRENCY: 2
+        TEMPEST_EXTEND_ATTACHED_VOLUME: true
+        TEMPEST_PLUGINS: cinder-tempest-plugin
+        TEMPEST_RUN_VALIDATION: false
+        TEMPEST_VOLUME_REVERT_TO_SNAPSHOT: true
+        TEMPEST_VOLUME_VENDOR: StorPool
+        USE_PYTHON3: True
+        # cfg: block
+        TEMPEST_STORAGE_PROTOCOL: storpool
+        ENABLE_VOLUME_MULTIATTACH: true
+      devstack_local_conf:
+        test-config:
+          $TEMPEST_CONFIG:
+            validation:
+              run_validation: true
+        post-config:
+          $CINDER_CONF:
+            storpool:
+              volume_backend_name: storpool
+              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-multipath
+    parent: cinder-storpool-tempest-iscsi-multipath-parent
+    vars:
+      sp_experimental: true
+      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
+              use_multipath_for_image_xfer: True
+          $NOVA_CONF:
+            libvirt:
+              # cfg: iscsi
+              volume_use_multipath: True
+      tempest_test_regex: |
+        volume|^cinder_tempest_plugin
+#        ^cinder_tempest_plugin
+#        (^(tempest\.((api\..*volume)|scenario\.test_encrypted_cinder_volumes|scenario\.test_volume|scenario\.test_shelve_instance))|(cinder_tempest_plugin))
+
+
+- job:
+    name: cinder-storpool-tempest-iscsi-multipath-testing
+    parent: cinder-storpool-tempest-iscsi-multipath
+    vars:
+      sp_target_release: "testing"
+
+
+- job:
+    name: kolla-cinder-storpool-tempest-iscsi-multipath
+    pre-run:
+      - playbooks/workarounds/01-disable-unattended-upgrades.yaml
+      - playbooks/setup-openstack-client/pre.yaml
+      - playbooks/setup-openstack-iscsi-multipath/pre.yaml
+      - playbooks/setup-openstack-storpool/pre.yaml
+      - playbooks/kolla-setup-openstack-iscsi-multipath-storpool/pre.yaml
+    run: playbooks/kolla-setup-openstack-iscsi-multipath-storpool/run.yaml
+    cleanup-run:
+      - playbooks/kolla-setup-openstack-iscsi-multipath-storpool/post.yaml
+      - playbooks/setup-openstack-storpool/post.yaml
+      - playbooks/setup-openstack-iscsi-multipath/post.yaml
+      - playbooks/setup-openstack-client/post.yaml
+    required-projects:
+      - opendev.org/openstack/tempest
+    timeout: 10800
+    nodeset: ubuntu2204-openstack-multi-node-mixed
+    attempts: 1
+    secrets:
+      # openstack-client
+      - name: OPENSTACK_DATA
+        secret: OPENSTACK_DATA
+      - name: RESOLVED_DATA
+        secret: RESOLVED_DATA
+
+      # openstack-iscsi-multipath-storpool
+      - name: STORPOOL_DEPLOY_KEY
+        secret: STORPOOL_DEPLOY_KEY
+      - name: STORPOOL_DEPLOY_KEY_PUB
+        secret: STORPOOL_DEPLOY_KEY_PUB
+      - name: STORPOOL_DEPLOY
+        secret: STORPOOL_DEPLOY
+      - name: STORPOOL_DEPLOY_INFO_CONF
+        secret: STORPOOL_DEPLOY_INFO_CONF
+      - name: STORPOOL_ISCSI_INVENTORY
+        secret: STORPOOL_ISCSI_INVENTORY
+      - name: STORPOOL_ISCSI_NETPLAN
+        secret: STORPOOL_ISCSI_NETPLAN
+      - name: STORPOOL_STORPOOL_NETPLAN
+        secret: STORPOOL_STORPOOL_NETPLAN
+      - name: STORPOOL_NETPLAN_SERVICE
+        secret: STORPOOL_NETPLAN_SERVICE
+      - name: STORPOOL_CONF_ISCSI
+        secret: STORPOOL_CONF_ISCSI
+      - name: STORPOOL_CONF_ISCSI_NODE
+        secret: STORPOOL_CONF_ISCSI_NODE
+      - name: ISCSI_NODE_SYSTEMD_NETWORKD
+        secret: ISCSI_NODE_SYSTEMD_NETWORKD
+    vars:
+      os_venv: "~/sp-venv-openstack"
+      storpool_connection: "iscsi"
+      sp_target_release: "release"
+
+      zuul_copy_output:
+        /etc/multipath.conf: logs_txt
+        /etc/iscsi/iscsid.conf: logs_txt
+
+      tempest_test_regex: volume
+
+- job:
+    name: kolla-cinder-storpool-tempest-iscsi-multipath-zed-ubuntu-jammy-pre-release
+    parent: kolla-cinder-storpool-tempest-iscsi-multipath
+    vars:
+      sp_target_release: "release"
+
+      kolla_ansible_version: "16.2.0"
+      kolla_openstack_release: "zed"
+      enable_cinder_backend_storpool: "yes"
+      kolla_nova_compute_image_full: "cts.storpool.com/kolla/ubuntu-binary-nova-compute:zed-ubuntu-jammy-pre-release"
+      kolla_cinder_volume_image_full: "cts.storpool.com/kolla/ubuntu-binary-cinder-volume:zed-ubuntu-jammy-pre-release"
+      kolla_glance_api_image_full: "quay.io/openstack.kolla/glance-api:zed-ubuntu-jammy"
+
+- job:
+    name: kolla-cinder-tempest-iscsi-multipath-2023.2-ubuntu-jammy-lvm-reference
+    parent: kolla-cinder-storpool-tempest-iscsi-multipath
+    vars:
+      sp_target_release: "release"
+
+      kolla_ansible_version: "stable/2023.2"
+      kolla_openstack_release: "2023.2"
+      enable_cinder_backend_storpool: "no"
+      kolla_nova_compute_image_full: "quay.io/openstack.kolla/nova-compute:2023.2-ubuntu-jammy"
+      kolla_cinder_volume_image_full: "quay.io/openstack.kolla/cinder-volume:2023.2-ubuntu-jammy"
+      kolla_glance_api_image_full: "quay.io/openstack.kolla/glance-api:2023.2-ubuntu-jammy"
+
+- job:
+    name: kolla-cinder-storpool-tempest-iscsi-multipath-2023.2-ubuntu-jammy-pre-release
+    parent: kolla-cinder-storpool-tempest-iscsi-multipath
+    vars:
+      sp_target_release: "release"
+
+      kolla_ansible_version: "stable/2023.2"
+      kolla_openstack_release: "2023.2"
+      enable_cinder_backend_storpool: "yes"
+      kolla_nova_compute_image_full: "cts.storpool.com/kolla/ubuntu-binary-nova-compute:2023.2-ubuntu-jammy-pre-release"
+      kolla_cinder_volume_image_full: "cts.storpool.com/kolla/ubuntu-binary-cinder-volume:2023.2-ubuntu-jammy-pre-release"
+      kolla_glance_api_image_full: "cts.storpool.com/kolla/ubuntu-binary-glance-api:2023.2-ubuntu-jammy-pre-release"
+
+- job:
+    name: kolla-cinder-storpool-tempest-iscsi-multipath-testing
+    parent: kolla-cinder-storpool-tempest-iscsi-multipath
+    vars:
+      sp_target_release: "testing"
+
+      kolla_ansible_version: "16.2.0"
+      kolla_openstack_release: "zed"
+      enable_cinder_backend_storpool: "yes"
+      kolla_nova_compute_image_full: "cts.storpool.com/kolla/ubuntu-binary-nova-compute:zed-ubuntu-jammy"
+      kolla_cinder_volume_image_full: "cts.storpool.com/kolla/ubuntu-binary-cinder-volume:zed-ubuntu-jammy"
+      kolla_glance_api_image_full: "quay.io/openstack.kolla/glance-api:2023.2-ubuntu-jammy"
+
+- project:
+    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-iscsi:
+        #    branches: master
+
+- project:
+    name: openstack/os-brick
+    check:
+      jobs:
+        - cinder-storpool-tempest:
+            branches: master
+
+- project:
+    name: kolla-experiments
+    check:
+      jobs:
+        - kolla-cinder-tempest-iscsi-multipath-2023.2-ubuntu-jammy-lvm-reference:
+            branches: master
+        - kolla-cinder-storpool-tempest-iscsi-multipath-2023.2-ubuntu-jammy-pre-release:
+            branches: master
+
+- project:
+    name: storpool-experiments
+    check:
+      jobs:
+        - cinder-storpool-tempest-testing:
+            branches: master
+        - cinder-storpool-tempest-iscsi-multipath-testing:
+            branches: master
+        - kolla-cinder-storpool-tempest-iscsi-multipath-testing:
+            branches: master