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 bb770f8ae6..0d75f32813 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml @@ -675,6 +675,7 @@ - python-havana-bitrot-jobs - openstack-publish-jobs - translation-jobs + - rally-jobs - project: name: heat-specs diff --git a/modules/openstack_project/files/jenkins_job_builder/config/rally.yaml b/modules/openstack_project/files/jenkins_job_builder/config/rally.yaml index ea506c8c99..37c25b8e21 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/rally.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/rally.yaml @@ -33,6 +33,7 @@ export PROJECTS="stackforge/rally $PROJECTS" export PROJECTS="openstack/ceilometer $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} @@ -71,6 +72,7 @@ - devstack-rally-gate: scenario: '{name}' neutron: '0' + large_ops: '0' publishers: - devstack-logs @@ -91,6 +93,28 @@ - devstack-rally-gate: scenario: '{name}-neutron' neutron: '1' + large_ops: '0' + + publishers: + - devstack-logs + - console-log + - rally-plot + + +- job-template: + name: 'gate-rally-dsvm-fakevirt-{name}' + node: 'devstack-precise || devstack-trusty' + + wrappers: + - build-timeout: + timeout: 125 + - timestamps + + builders: + - devstack-rally-gate: + scenario: '{name}-neutron' + neutron: '0' + large_ops: '10' publishers: - devstack-logs @@ -142,3 +166,4 @@ jobs: - 'gate-rally-dsvm-{name}' - 'gate-rally-dsvm-neutron-{name}' + - 'gate-rally-dsvm-fakevirt-{name}' diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index fe22c37060..d5c0856fd6 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -478,6 +478,8 @@ jobs: queue-name: integrated - name: gate-rally-dsvm-neutron-neutron voting: false + - name: gate-rally-dsvm-fakevirt-heat + voting: false - name: ^(gate|check)-tempest-dsvm-neutron-full$ voting: false - name: ^(gate|check)-tempest-dsvm-neutron-full-icehouse$ @@ -972,6 +974,7 @@ projects: - name: translation-jobs check: - check-devstack-dsvm-cells + - gate-rally-dsvm-fakevirt-heat gate: - gate-devstack-dsvm-cells experimental-tripleo: