openstack/project-config
Code Issues Proposed changes

run integration testing for chef-cookbooks on centos7 and trusty

Browse Source 
* added {node} variable to gate-*-chef-rake-integration-nv job template to allow
  converge of ubuntu and centos7 nodes for integration testing of all
  chef-cookbooks (same goes for the periodic integration test in the chef-repo)
* removed quoting for job template names in chef-jobs

Change-Id: Ia4ea9866057b12d7aa0176284ea88a50ab9fbee8
This commit is contained in:
Jan Klare 2016-02-29 18:04:28 +01:00
parent 6fec170531
commit d4c7da2f5b
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
jenkins/jobs/chef-jobs.yaml
View File

@ -1,7 +1,7 @@
# this job template requires a bootstrap.sh script (which installs chefdk and other dependencies)
# and a Rakefile with the tests that should be executed in the cookbook
- job-template:
name: 'gate-{name}-chef-rake'
name: gate-{name}-chef-rake
node: '{node}'
wrappers:
@ -11,7 +11,7 @@
builders:
- print-template-name:
template-name: "{template-name}"
template-name: '{template-name}'
- gerrit-git-prep
- chef-bootstrap
- revoke-sudo
@ -24,7 +24,7 @@
# and a Rakefile with the integration tests that should be executed
# sudo privileges for jenkins are not revoked, since they are needed during the chef run executed for integration testing
- job-template:
name: 'gate-{name}-chef-rake-integration-nv'
name: gate-{node}-{name}-chef-rake-integration-nv
node: '{node}'
wrappers:
@ -34,7 +34,7 @@
builders:
- print-template-name:
template-name: "{template-name}"
template-name: '{template-name}'
- gerrit-git-prep
- chef-bootstrap
- chef-rake-integration
@ -43,7 +43,7 @@
- console-log
- job-template:
name: 'periodic-{name}-chef-rake-integration'
name: periodic-{node}-{name}-chef-rake-integration
node: '{node}'
wrappers:
@ -53,7 +53,7 @@
builders:
- print-template-name:
template-name: "{template-name}"
template-name: '{template-name}'
- branch-git-prep:
branch: master
- chef-bootstrap
@ -65,6 +65,12 @@
- job-group:
name: chef-test-jobs
jobs:
- 'gate-{name}-chef-rake'
- 'gate-{name}-chef-rake-integration-nv'
- 'periodic-{name}-chef-rake-integration'
- gate-{name}-chef-rake
- gate-{node}-{name}-chef-rake-integration-nv:
node:
- devstack-centos7
- ubuntu-trusty
- periodic-{node}-{name}-chef-rake-integration:
node:
- devstack-centos7
- ubuntu-trusty

6
zuul/layout.yaml
View File

@ -532,7 +532,8 @@ project-templates:
- name: chef-rake-jobs
check:
- 'gate-{name}-chef-rake'
- 'gate-{name}-chef-rake-integration-nv'
- 'gate-devstack-centos7-{name}-chef-rake-integration-nv'
- 'gate-ubuntu-trusty-{name}-chef-rake-integration-nv'
gate:
- 'gate-{name}-chef-rake'
@ -7447,7 +7448,8 @@ projects:
- name: merge-check
- name: chef-rake-jobs
periodic:
- periodic-openstack-chef-repo-chef-rake-integration
- periodic-devstack-centos7-openstack-chef-repo-chef-rake-integration
- periodic-ubuntu-trusty-openstack-chef-repo-chef-rake-integration
- name: openstack/openstack-chef-specs
template: