openstack/project-config
Code Issues Proposed changes

Move gate-{name}-chef-rake to ubuntu-xenial

Browse Source 
This commit alters the chef jobs in jenkins to run on xenial in addition
to trusty. In the future the trusty jobs can be removed. Older branches
will continue to use trusty.

This job also renames some chef jobs to have the {node} portion at the
end of the job name, which should fit the job name standard closer.

Change-Id: Idfbb264f31e218d4b3c6f2351175fff5f0d52f8a
This commit is contained in:
Ben Kero 2016-07-26 23:07:23 -07:00
parent df845a9ad0
commit 5bac28ae58
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,8 @@
# this job template requires a bootstrap.sh script (which installs chefdk and other dependencies) # 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 # and a Rakefile with the tests that should be executed in the cookbook
- job-template: - job-template:
name: gate-{name}-chef-rake name: 'gate-{name}-chef-rake'
node: ubuntu-trusty node: 'ubuntu-xenial'
wrappers: wrappers:
- build-timeout: - build-timeout:
@ -25,7 +25,7 @@
# and a Rakefile with the integration tests that should be executed # 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 # sudo privileges for jenkins are not revoked, since they are needed during the chef run executed for integration testing
- job-template: - job-template:
name: gate-{node}-{name}-chef-rake-integration-nv name: gate-{name}-chef-rake-integration-{node}-nv
node: '{node}' node: '{node}'
wrappers: wrappers:
@ -46,7 +46,7 @@
- console-log - console-log
- job-template: - job-template:
name: periodic-{node}-{name}-chef-rake-integration name: periodic-{name}-chef-rake-integration-{node}
node: '{node}' node: '{node}'
wrappers: wrappers:
@ -71,7 +71,7 @@
name: chef-test-jobs name: chef-test-jobs
jobs: jobs:
- gate-{name}-chef-rake - gate-{name}-chef-rake
- gate-{node}-{name}-chef-rake-integration-nv: - gate-{name}-chef-rake-integration-{node}-nv:
node: node:
- centos-7 - centos-7
- ubuntu-trusty - ubuntu-trusty

2
jenkins/jobs/projects.yaml
View File

@ -5710,7 +5710,7 @@
jobs: jobs:
- chef-test-jobs - chef-test-jobs
- periodic-{node}-{name}-chef-rake-integration: - periodic-{name}-chef-rake-integration-{node}:
node: node:
- centos-7 - centos-7
- ubuntu-trusty - ubuntu-trusty

12
zuul/layout.yaml
View File

@ -767,9 +767,9 @@ project-templates:
- name: chef-rake-jobs - name: chef-rake-jobs
check: check:
- 'gate-{name}-chef-rake' - 'gate-{name}-chef-rake'
- 'gate-centos-7-{name}-chef-rake-integration-nv' - 'gate-{name}-chef-rake-integration-centos-7-nv'
- 'gate-ubuntu-trusty-{name}-chef-rake-integration-nv' - 'gate-{name}-chef-rake-integration-ubuntu-trusty-nv'
- 'gate-ubuntu-xenial-{name}-chef-rake-integration-nv' - 'gate-{name}-chef-rake-integration-ubuntu-xenial-nv'
gate: gate:
- 'gate-{name}-chef-rake' - 'gate-{name}-chef-rake'
@ -9969,9 +9969,9 @@ projects:
- name: merge-check - name: merge-check
- name: chef-rake-jobs - name: chef-rake-jobs
periodic: periodic:
- periodic-centos-7-openstack-chef-repo-chef-rake-integration - periodic-openstack-chef-repo-chef-rake-integration-centos-7
- periodic-ubuntu-trusty-openstack-chef-repo-chef-rake-integration - periodic-openstack-chef-repo-chef-rake-integration-ubuntu-trusty
- periodic-ubuntu-xenial-openstack-chef-repo-chef-rake-integration - periodic-openstack-chef-repo-chef-rake-integration-ubuntu-xenial
- name: openstack/openstack-chef-specs - name: openstack/openstack-chef-specs
template: template: