Merge "Added tempest job to manila project"

modules/openstack_project/files/jenkins_job_builder/config/manila.yaml

@@ -16,36 +16,57 @@
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_TIMEOUT=60
-          export ENABLED_SERVICES=manila,m-api,m-shr,m-sch,tempest
-          export PROJECTS="stackforge/manila $PROJECTS"
-          export PROJECTS="stackforge/python-manilaclient $PROJECTS"
-          export DEVSTACK_GATE_TEMPEST_ALLOW_TENANT_ISOLATION=1
-          export DEVSTACK_GATE_NEUTRON=1
-          export TEMPEST_CONCURRENCY=2
-          export KEEP_LOCALRC=1
-          export MANILA_TESTS='tempest.cli.*manila*'
-          if [[ ! "$ZUUL_PROJECT" =~ python-manilaclient ]]; then
-              MANILA_TESTS+=' tempest.api.share*';
-          fi
-          echo "API_RATE_LIMIT=False" >> localrc
-          echo "SHARE_BACKING_FILE_SIZE=30G" >> localrc
-          echo "VOLUME_BACKING_FILE_SIZE=30G" >> localrc
+
+          # Run setup script with exports of env vars
+          $BASE/new/manila/contrib/ci/setup.sh
 
           function pre_test_hook {
-              # Install manila devstack integration
-              cp -r $BASE/new/manila/contrib/devstack/* $BASE/new/devstack
-              # Install manila tempest integration
-              cp -r $BASE/new/manila/contrib/tempest/tempest/* $BASE/new/tempest/tempest
+              $BASE/new/manila/contrib/ci/pre_test_hook.sh
           }
           export -f pre_test_hook
 
           function post_test_hook {
-              # let us control if we die or not
-              set +o errexit
-              cd $BASE/new/tempest
-              sudo chown -R tempest:stack $BASE/new/tempest
-              echo "Running tempest manila test suites"
-              sudo -H -u tempest tox -evenv bash tools/pretty_tox.sh \"$MANILA_TESTS -- --concurrency=$TEMPEST_CONCURRENCY\"
+              $BASE/new/manila/contrib/ci/post_test_hook.sh
+          }
+          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-multibackend
+    node: devstack-precise
+
+    wrappers:
+      - timeout:
+          timeout: 65
+          fail: true
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TIMEOUT=60
+
+          # Run setup script with exports of env vars
+          $BASE/new/manila/contrib/ci/multi_backend/setup.sh
+
+          function pre_test_hook {
+              $BASE/new/manila/contrib/ci/multi_backend/pre_test_hook.sh
+          }
+          export -f pre_test_hook
+
+          function post_test_hook {
+              $BASE/new/manila/contrib/ci/multi_backend/post_test_hook.sh
           }
           export -f post_test_hook
 

modules/openstack_project/files/zuul/layout.yaml

@@ -563,6 +563,8 @@ jobs:
     voting: false
   - name: gate-manila-tempest-dsvm-neutron
     voting: false
+  - name: gate-manila-tempest-dsvm-neutron-multibackend
+    voting: false
   - name: gate-blazar-devstack-dsvm
     voting: false
   - name: gate-storyboard-python33
@@ -3854,11 +3856,11 @@ projects:
       - gate-manila-python26
       - gate-manila-python27
       - gate-manila-tempest-dsvm-neutron
+      - gate-manila-tempest-dsvm-neutron-multibackend
     gate:
       - gate-manila-pep8
       - gate-manila-python26
       - gate-manila-python27
-      - gate-manila-tempest-dsvm-neutron
     post:
       - manila-branch-tarball
       - manila-coverage
@@ -4594,7 +4596,6 @@ projects:
       - gate-python-manilaclient-pep8
       - gate-python-manilaclient-python26
       - gate-python-manilaclient-python27
-      - gate-manila-tempest-dsvm-neutron
     post:
       - python-manilaclient-branch-tarball
       - python-manilaclient-coverage