From a49fb4a31bb2b35cd13c40aacb32d6db0c0e7906 Mon Sep 17 00:00:00 2001 From: Dina Belova Date: Tue, 29 Jul 2014 13:12:05 +0400 Subject: [PATCH] Add job to run Tempest dsvm on MongoDB backend for Ceilometer This patch adds templates for both smoke and full Tempest tests executions and enables both of them to the experimental pipeline for Ceilometer to be able to debug its behavior in both cases. Change-Id: I5655dec73616a0b68665115c1406c41397e5e90c --- .../config/ceilometer.yaml | 61 +++++++++++++++++++ .../jenkins_job_builder/config/projects.yaml | 10 +++ .../openstack_project/files/zuul/layout.yaml | 6 ++ 3 files changed, 77 insertions(+) create mode 100644 modules/openstack_project/files/jenkins_job_builder/config/ceilometer.yaml diff --git a/modules/openstack_project/files/jenkins_job_builder/config/ceilometer.yaml b/modules/openstack_project/files/jenkins_job_builder/config/ceilometer.yaml new file mode 100644 index 0000000000..5d6186fdf0 --- /dev/null +++ b/modules/openstack_project/files/jenkins_job_builder/config/ceilometer.yaml @@ -0,0 +1,61 @@ +- job-template: + name: 'gate-tempest-dsvm-ceilometer-{backend}{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_CEILOMETER_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 + + publishers: + - devstack-logs + - console-log + + +- job-template: + name: 'gate-tempest-dsvm-ceilometer-{backend}-full{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_TEMPEST_FULL=1 + export DEVSTACK_GATE_CEILOMETER_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 + + publishers: + - devstack-logs + - console-log diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml index 4ec86beebd..57b4bd32fe 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml @@ -423,6 +423,16 @@ - python-havana-bitrot-jobs - openstack-publish-jobs - translation-jobs + - 'gate-tempest-dsvm-ceilometer-{backend}{branch-designator}': + backend: 'mongodb' + node: 'bare-trusty' + branch-designator: '' + branch-override: default + - 'gate-tempest-dsvm-ceilometer-{backend}-full{branch-designator}': + backend: 'mongodb' + node: 'bare-trusty' + branch-designator: '' + branch-override: default - project: name: cinder diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index 587c78d9ca..3f793a146e 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -713,6 +713,10 @@ jobs: voting: false - name: ^(gate|check)-marconi-python33 branch: ^(?!stable/(havana|icehouse)).*$ + - name: gate-tempest-dsvm-ceilometer-mongodb + voting: false + - name: gate-tempest-dsvm-ceilometer-mongodb-full + voting: false # The project list is grouped by type of project, and within each # group, projects are sorted (mostly) alphabetically. @@ -758,6 +762,8 @@ projects: - gate-swift-dsvm-functional experimental: - gate-grenade-dsvm-forward + - gate-tempest-dsvm-ceilometer-mongodb + - gate-tempest-dsvm-ceilometer-mongodb-full pre-release: - ceilometer-tarball release: