Merge "Add Manila-GlusterFS experimental jobs"

jenkins/jobs/manila.yaml

@@ -379,3 +379,129 @@
     publishers:
       - devstack-logs
       - console-log
+
+
+- job:
+    name: gate-manila-tempest-dsvm-neutron-glusterfs
+    node: 'devstack-precise || devstack-trusty'
+
+    wrappers:
+      - build-timeout:
+          timeout: 65
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TIMEOUT=60
+          export DEVSTACK_GATE_NEUTRON=1
+          export ENABLED_SERVICES=tempest
+          export PROJECTS="stackforge/devstack-plugin-glusterfs $PROJECTS"
+
+          if [[ $ZUUL_BRANCH = "stable/juno" ]]; then
+              # Juno version uses 'hooks' approach that requires explicit
+              # enabling of services.
+              ENABLED_SERVICES+=,manila,m-api,m-shr,m-sch
+          else
+              # Enable manila devstack plugin. Provided repo should be cloned by zuul before devstack run
+              # and below provided link should not be used.
+              export DEVSTACK_LOCAL_CONFIG="enable_plugin manila git://git.openstack.org/openstack/manila"
+          fi
+
+          # Enable devstack-plugin-glusterfs plugin, to install and configure GlusterFS.
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin devstack-plugin-glusterfs git://git.openstack.org/stackforge/devstack-plugin-glusterfs"
+
+          # Configure devstack-plugin-glusterfs to enable GlusterFS as a backend for Manila.
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"CONFIGURE_GLUSTERFS_MANILA=True"
+
+          # Configure devstack-plugin-glusterfs to use glusterfs-native driver.
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"GLUSTERFS_MANILA_DRIVER_TYPE=glusterfs"
+
+          # Keep localrc to be able to set some vars in pre_test_hook
+          export KEEP_LOCALRC=1
+
+          function pre_test_hook {
+              # Configure devstack to run manila installation without handling of share servers
+              source $BASE/new/manila/contrib/ci/pre_test_hook.sh False
+          }
+          export -f pre_test_hook
+
+          function post_test_hook {
+              # Configure and run tempest on singlebackend manila installation
+              source $BASE/new/manila/contrib/ci/post_test_hook.sh singlebackend
+          }
+          export -f post_test_hook
+
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+
+    publishers:
+      - devstack-logs
+      - console-log
+
+
+- job:
+    name: gate-manila-tempest-dsvm-neutron-glusterfs-native
+    node: 'devstack-precise || devstack-trusty'
+
+    wrappers:
+      - build-timeout:
+          timeout: 65
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TIMEOUT=60
+          export DEVSTACK_GATE_NEUTRON=1
+          export ENABLED_SERVICES=tempest
+          export PROJECTS="stackforge/devstack-plugin-glusterfs $PROJECTS"
+
+          if [[ $ZUUL_BRANCH = "stable/juno" ]]; then
+              # Juno version uses 'hooks' approach that requires explicit
+              # enabling of services.
+              ENABLED_SERVICES+=,manila,m-api,m-shr,m-sch
+          else
+              # Enable manila devstack plugin. Provided repo should be cloned by zuul before devstack run
+              # and below provided link should not be used.
+              export DEVSTACK_LOCAL_CONFIG="enable_plugin manila git://git.openstack.org/openstack/manila"
+          fi
+
+          # Enable devstack-plugin-glusterfs plugin, to install and configure GlusterFS.
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin devstack-plugin-glusterfs git://git.openstack.org/stackforge/devstack-plugin-glusterfs"
+
+          # Configure devstack-plugin-glusterfs to enable GlusterFS as a backend for Manila.
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"CONFIGURE_GLUSTERFS_MANILA=True"
+
+          # Configure devstack-plugin-glusterfs to use glusterfs-native driver.
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"GLUSTERFS_MANILA_DRIVER_TYPE=glusterfs-native"
+
+          # Keep localrc to be able to set some vars in pre_test_hook
+          export KEEP_LOCALRC=1
+
+          function pre_test_hook {
+              # Configure devstack to run manila installation without handling of share servers
+              source $BASE/new/manila/contrib/ci/pre_test_hook.sh False
+          }
+          export -f pre_test_hook
+
+          function post_test_hook {
+              # Configure and run tempest on singlebackend manila installation
+              source $BASE/new/manila/contrib/ci/post_test_hook.sh singlebackend
+          }
+          export -f post_test_hook
+
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+
+    publishers:
+      - devstack-logs
+      - console-log

zuul/layout.yaml

@@ -1255,6 +1255,12 @@ jobs:
     branch: ^(?!stable/juno).*$
     voting: false
 
+  - name: gate-manila-tempest-dsvm-neutron-glusterfs
+    voting: false
+
+  - name: gate-manila-tempest-dsvm-neutron-glusterfs-native
+    voting: false
+
   - name: gate-rally-dsvm-manila-multibackend
     voting: false
 
@@ -2289,6 +2295,8 @@ projects:
       - gate-rally-dsvm-manila-multibackend
       - gate-rally-dsvm-manila-multibackend-no-ss
       - gate-manila-tempest-dsvm-tempest-plugin
+      - gate-manila-tempest-dsvm-neutron-glusterfs
+      - gate-manila-tempest-dsvm-neutron-glusterfs-native
 
   - name: openstack/mistral
     template:
@@ -6588,6 +6596,8 @@ projects:
     check:
       - gate-devstack-plugin-glusterfs-bashate
       - gate-tempest-dsvm-full-glusterfs
+      - gate-manila-tempest-dsvm-neutron-glusterfs
+      - gate-manila-tempest-dsvm-neutron-glusterfs-native
     gate:
       - gate-devstack-plugin-glusterfs-bashate