From 59ac87710242d15f843d3914e1d06331563fa964 Mon Sep 17 00:00:00 2001 From: Boris Pavlovic Date: Wed, 24 Dec 2014 20:22:44 +0400 Subject: [PATCH] Add Rally performace job template for Mistral Mistral team would like to use Rally for testing. We have to create a separated Rally job template because Mistral is not installed by default in DSVM jobs. Change-Id: I05afc391d52763cde9381db2fb2ad76246ea3d11 --- jenkins/jobs/rally.yaml | 60 +++++++++++++++++++++++++++++++++++++++++ zuul/layout.yaml | 1 + 2 files changed, 61 insertions(+) diff --git a/jenkins/jobs/rally.yaml b/jenkins/jobs/rally.yaml index ca9c26ca4c..b794d7abcc 100644 --- a/jenkins/jobs/rally.yaml +++ b/jenkins/jobs/rally.yaml @@ -160,6 +160,44 @@ ./safe-devstack-vm-gate-wrap.sh +- builder: + name: devstack-mistral-rally-gate + builders: + - link-logs + - devstack-checkout + - shell: | + #!/bin/bash -xe + export PROJECTS="stackforge/rally $PROJECTS" + export PROJECTS="stackforge/mistral $PROJECTS" + export PROJECTS="stackforge/python-mistralclient $PROJECTS" + + export DEVSTACK_GATE_NEUTRON={neutron} + export DEVSTACK_GATE_TEMPEST_LARGE_OPS={large_ops} + export DEVSTACK_GATE_EXERCISES=0 + export DEVSTACK_GATE_TIMEOUT=120 + export RALLY_SCENARIO={scenario} + + export ENABLED_SERVICES=mistral,rally + + function pre_test_hook {{ + # Install rally-devstack integration + cp -r $BASE/new/rally/contrib/devstack/* $BASE/new/devstack/ + + # Install mistral-devstack integration + cd /opt/stack/new/mistral/functionaltests + ./pre_test_hook.sh + }} + export -f pre_test_hook + + function post_test_hook {{ + $BASE/new/rally/tests/ci/rally-gate.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 + + - job-template: name: 'gate-rally-dsvm-murano-{name}' node: 'devstack-precise || devstack-trusty' @@ -181,6 +219,27 @@ - rally-plot +- job-template: + name: 'gate-rally-dsvm-mistral-{name}' + node: 'devstack-precise || devstack-trusty' + + wrappers: + - build-timeout: + timeout: 125 + - timestamps + + builders: + - devstack-mistral-rally-gate: + scenario: '{name}-mistral' + neutron: '0' + large_ops: '0' + + publishers: + - devstack-logs + - console-log + - rally-plot + + - job-template: name: 'gate-rally-dsvm-designate-{name}' node: 'devstack-precise || devstack-trusty' @@ -378,6 +437,7 @@ - 'gate-rally-dsvm-{name}' - 'gate-rally-dsvm-designate-{name}' - 'gate-rally-dsvm-murano-{name}' + - 'gate-rally-dsvm-mistral-{name}' - 'gate-rally-dsvm-neutron-{name}' - 'gate-rally-dsvm-fakevirt-{name}' - 'gate-rally-dsvm-zaqar-{name}' diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 73f3cab979..b1c1257544 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -5345,6 +5345,7 @@ projects: - rally-coverage experimental: - gate-rally-dsvm-murano-rally + - gate-rally-dsvm-mistral-rally - gate-rally-dsvm-designate-rally - gate-rally-dsvm-zaqar-rally