diff --git a/jenkins/jobs/devstack-gate.yaml b/jenkins/jobs/devstack-gate.yaml index 6b210f8b83..945dbbc8e6 100644 --- a/jenkins/jobs/devstack-gate.yaml +++ b/jenkins/jobs/devstack-gate.yaml @@ -815,43 +815,6 @@ - devstack-logs - console-log -- job-template: - name: '{pipeline}-tempest-dsvm-zaqar{branch-designator}' - node: '{node}' - - wrappers: - - build-timeout: - timeout: 125 - - timestamps - - builders: - - link-logs - - net-info - - devstack-checkout - - shell: | - #!/bin/bash -xe - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_ZAQAR=1 - export BRANCH_OVERRIDE={branch-override} - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh - - function post_test_hook {{ - gzip -9 -c /var/log/zaqar/queues.log > $WORKSPACE/logs/queues.log.txt.gz - }} - export -f post_test_hook - - publishers: - - devstack-logs - - console-log - - - job-template: name: '{pipeline}-tempest-dsvm-cells{branch-designator}' node: '{node}' @@ -1734,7 +1697,6 @@ - '{pipeline}-tempest-dsvm-ironic-agent_ssh{branch-designator}' - '{pipeline}-tempest-dsvm-ironic-agent_ssh-src{branch-designator}' - '{pipeline}-tempest-dsvm-ironic-parallel{branch-designator}' - - '{pipeline}-tempest-dsvm-zaqar{branch-designator}' - '{pipeline}-tempest-dsvm-all{branch-designator}' - '{pipeline}-tempest-dsvm-coverage{branch-designator}' - '{pipeline}-tempest-dsvm-stress{branch-designator}' diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 8a2fdeca05..25fb26c9b3 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -534,6 +534,30 @@ - python-jobs - openstack-publish-jobs - translation-jobs + - '{pipeline}-tempest-dsvm-{backend}-zaqar{branch-designator}': + pipeline: check + node: 'devstack-trusty' + branch-designator: '' + branch-override: default + backend: mongodb + - '{pipeline}-tempest-dsvm-{backend}-zaqar{branch-designator}': + pipeline: check + node: 'devstack-trusty' + branch-designator: '' + branch-override: default + backend: redis + - '{pipeline}-tempest-dsvm-{backend}-zaqar{branch-designator}': + pipeline: gate + node: 'devstack-trusty' + branch-designator: '' + branch-override: default + backend: mongodb + - '{pipeline}-tempest-dsvm-{backend}-zaqar{branch-designator}': + pipeline: gate + node: 'devstack-trusty' + branch-designator: '' + branch-override: default + backend: redis - project: name: zaqar-specs diff --git a/jenkins/jobs/zaqar.yaml b/jenkins/jobs/zaqar.yaml index 324592d22c..ee52e0565b 100644 --- a/jenkins/jobs/zaqar.yaml +++ b/jenkins/jobs/zaqar.yaml @@ -42,3 +42,41 @@ - test-results - devstack-logs - console-log + + +- job-template: + name: '{pipeline}-tempest-dsvm-{backend}-zaqar{branch-designator}' + node: '{node}' + + wrappers: + - build-timeout: + timeout: 125 + - timestamps + + builders: + - link-logs + - net-info + - devstack-checkout + - shell: | + #!/bin/bash -xe + export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=120 + export DEVSTACK_GATE_TEMPEST=1 + export DEVSTACK_GATE_ZAQAR=1 + export DEVSTACK_GATE_ZAQAR_BACKEND={backend} + export BRANCH_OVERRIDE={branch-override} + if [ "$BRANCH_OVERRIDE" != "default" ] ; then + export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE + fi + + cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh + ./safe-devstack-vm-gate-wrap.sh + + function post_test_hook {{ + gzip -9 -c /var/log/zaqar/queues.log > $WORKSPACE/logs/queues.log.txt.gz + }} + export -f post_test_hook + + publishers: + - devstack-logs + - console-log diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 1565529492..a461dc82ee 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -1543,11 +1543,14 @@ projects: - name: pypy-jobs check: - gate-zaqar-python26 - - check-tempest-dsvm-zaqar + - check-tempest-dsvm-mongodb-zaqar + - check-tempest-dsvm-redis-zaqar - gate-zaqar-python33 gate: - gate-zaqar-python26 - - gate-tempest-dsvm-zaqar + - gate-tempest-dsvm-mongodb-zaqar + - gate-tempest-dsvm-redis-zaqar + - gate-zaqar-python33 pre-release: - zaqar-tarball release: @@ -2654,7 +2657,8 @@ projects: experimental: - gate-grenade-dsvm-forward - check-tempest-dsvm-cells-full - - check-tempest-dsvm-zaqar + - check-tempest-dsvm-mongodb-zaqar + - check-tempest-dsvm-redis-zaqar - check-tempest-dsvm-keystonev3-full - check-tempest-dsvm-neutron-keystonev3-full - gate-tempest-dsvm-ceilometer-mongodb @@ -2996,7 +3000,7 @@ projects: - devstack-publish-docs experimental: - check-tempest-dsvm-cells-full - - check-tempest-dsvm-zaqar + - check-tempest-dsvm-mongodb-zaqar - gate-grenade-dsvm-forward - name: openstack-dev/devstack-vagrant