openstack/project-config
Code Issues Proposed changes

puppet: split integration job in 2

Browse Source 
One integration job does not scale, we're running out of RAM and Tempest
fails to run all the tests we want.

This patch split single node integration job in 2 to support 2
scenarios.

Change-Id: I1968a650fadd2c659b1dd3148ee0f86ec21b04de
This commit is contained in:
Emilien Macchi 2015-10-01 14:22:23 -04:00
parent 87eedf565f
commit 61daa92b73
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jenkins/jobs/puppet-module-jobs.yaml
View File

@ -243,7 +243,7 @@
- console-log - console-log
- job-template: - job-template:
name: 'gate-puppet-openstack-integration-dsvm-{ostype}' name: 'gate-puppet-openstack-integration-{scenario}-dsvm-{ostype}'
node: 'devstack-{ostype}' node: 'devstack-{ostype}'
builders: builders:
@ -252,6 +252,7 @@
project: openstack/puppet-openstack-integration project: openstack/puppet-openstack-integration
- shell: | - shell: |
#!/bin/bash -xe #!/bin/bash -xe
export SCENARIO={scenario}
cd openstack/puppet-openstack-integration cd openstack/puppet-openstack-integration
mkdir .bundled_gems mkdir .bundled_gems
export GEM_HOME=`pwd`/.bundled_gems export GEM_HOME=`pwd`/.bundled_gems
@ -311,5 +312,8 @@
ostype: ostype:
- trusty - trusty
- centos7 - centos7
scenario:
- scenario001
- scenario002
jobs: jobs:
- 'gate-puppet-openstack-integration-dsvm-{ostype}' - 'gate-puppet-openstack-integration-{scenario}-dsvm-{ostype}'

8
zuul/layout.yaml
View File

@ -511,8 +511,10 @@ project-templates:
- name: puppet-openstack-integration-jobs - name: puppet-openstack-integration-jobs
check: check:
- gate-puppet-openstack-integration-dsvm-trusty - gate-puppet-openstack-integration-scenario001-dsvm-trusty
- gate-puppet-openstack-integration-dsvm-centos7 - gate-puppet-openstack-integration-scenario001-dsvm-centos7
- gate-puppet-openstack-integration-scenario002-dsvm-trusty
- gate-puppet-openstack-integration-scenario002-dsvm-centos7
- name: puppet-syntax - name: puppet-syntax
check: check:
@ -767,7 +769,7 @@ jobs:
- name: ^gate-openstackci-beaker-.*$ - name: ^gate-openstackci-beaker-.*$
voting: false voting: false
- name: ^gate-puppet-openstack-integration-dsvm-.*$ - name: ^gate-puppet-openstack-integration-.*-dsvm-.*$
voting: false voting: false
branch: ^(?!stable/kilo).*$ branch: ^(?!stable/kilo).*$