diff --git a/jenkins/jobs/manila.yaml b/jenkins/jobs/manila.yaml index 62d9092245..f33a8e506b 100644 --- a/jenkins/jobs/manila.yaml +++ b/jenkins/jobs/manila.yaml @@ -1,3 +1,49 @@ +- job: + name: gate-manila-tempest-dsvm-neutron-postgres + 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 DEVSTACK_GATE_POSTGRES=1 + export ENABLED_SERVICES=tempest + # 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" + + # Keep localrc to be able to set some vars in pre_test_hook + export KEEP_LOCALRC=1 + + function pre_test_hook { + source $BASE/new/manila/contrib/ci/pre_test_hook.sh + } + 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 node: 'devstack-precise || devstack-trusty' diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 99a61334a5..5494b8523e 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -890,6 +890,8 @@ jobs: voting: false - name: gate-manila-pylint voting: false + - name: gate-manila-tempest-dsvm-neutron-postgres + voting: false - name: gate-manila-tempest-dsvm-neutron-no-share-servers voting: false - name: gate-manila-tempest-dsvm-neutron-scenario @@ -1520,6 +1522,7 @@ projects: - gate-manila-tempest-dsvm-neutron - gate-manila-tempest-dsvm-neutron-multibackend - gate-manila-tempest-dsvm-neutron-no-share-servers + - gate-manila-tempest-dsvm-neutron-postgres gate: - gate-manila-tox-genconfig - gate-manila-tempest-dsvm-neutron