openstack/project-config
Code Issues Proposed changes

Removed testjobs and corresponding chef-jobs

Browse Source 
* deleted juno and icehouse testjobs caused of deprecation
* deleted chef-jobs and made all integration gate jobs non
  voting
Change-Id: Ie8efac35cd6293bf2275cacb76946593b77cc338
This commit is contained in:
Christoph Albers 2016-01-07 16:26:59 +01:00
parent d2a4665044
commit de88b1b286
2 changed files with 3 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,25 +1,3 @@
- job-template:
name: 'gate-{name}-chef-unit'
node: bare-precise
wrappers:
- build-timeout:
timeout: 60
- timestamps
builders:
- print-template-name:
template-name: "{template-name}"
- gerrit-git-prep
- ruby-191-prep
- chef-bundler-prep
- revoke-sudo
- chef-berkshelf-prep
- chef-cookbook-chefspec
publishers:
- console-log
# 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:
@ -46,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'
name: 'gate-{name}-chef-rake-integration-nv'
node: '{node}'
wrappers:
@ -84,50 +62,6 @@
publishers:
- console-log
- job-template:
name: 'gate-{name}-chef-lint'
node: bare-precise
wrappers:
- build-timeout:
timeout: 60
- timestamps
builders:
- print-template-name:
template-name: "{template-name}"
- gerrit-git-prep
- ruby-191-prep
- chef-bundler-prep
- revoke-sudo
- chef-berkshelf-prep
- chef-cookbook-foodcritic
publishers:
- console-log
- job-template:
name: 'gate-{name}-chef-style'
node: bare-precise
wrappers:
- build-timeout:
timeout: 60
- timestamps
builders:
- print-template-name:
template-name: "{template-name}"
- gerrit-git-prep
- ruby-191-prep
- chef-bundler-prep
- revoke-sudo
- chef-berkshelf-prep
- chef-cookbook-rubocop
publishers:
- console-log
- job:
name: gate-openstack-chef-repo
node: bare-precise
@ -149,9 +83,6 @@
- job-group:
name: chef-test-jobs
jobs:
- 'gate-{name}-chef-lint'
- 'gate-{name}-chef-style'
- 'gate-{name}-chef-unit'
- 'gate-{name}-chef-rake'
- 'gate-{name}-chef-rake-integration'
- 'gate-{name}-chef-rake-integration-nv'
- 'periodic-{name}-chef-rake-integration'

35
zuul/layout.yaml
View File

@ -553,19 +553,10 @@ project-templates:
release:
- 'hook-{name}-rtfd'
- name: chef-jobs
check:
- 'gate-{name}-chef-lint'
- 'gate-{name}-chef-style'
- 'gate-{name}-chef-unit'
gate:
- 'gate-{name}-chef-lint'
- 'gate-{name}-chef-unit'
- name: chef-rake-jobs
check:
- 'gate-{name}-chef-rake'
- 'gate-{name}-chef-rake-integration'
- 'gate-{name}-chef-rake-integration-nv'
gate:
- 'gate-{name}-chef-rake'
@ -715,13 +706,6 @@ jobs:
parameter-function: set_node_options
swift:
- name: logs
- name: ^gate-.*-chef-(lint|style|unit|repo)$
branch: ^stable/(icehouse|juno)$
- name: ^gate-.*-chef-rake-integration$
branch: ^(?!stable/(icehouse|juno)).*$
voting: false
- name: ^gate-.*-chef-rake.*$
branch: ^(?!stable/(icehouse|juno)).*$
# -nv jobs are never voting.
- name: ^.*-nv$
voting: false
@ -4259,103 +4243,86 @@ projects:
- name: openstack/cookbook-openstack-bare-metal
template:
- name: merge-check
- name: chef-jobs
- name: chef-rake-jobs
- name: openstack/cookbook-openstack-block-storage
template:
- name: merge-check
- name: chef-jobs
- name: chef-rake-jobs
- name: openstack/cookbook-openstack-client
template:
- name: merge-check
- name: chef-jobs
- name: chef-rake-jobs
- name: openstack/cookbook-openstack-common
template:
- name: merge-check
- name: chef-jobs
- name: chef-rake-jobs
- name: openstack/cookbook-openstack-compute
template:
- name: merge-check
- name: chef-jobs
- name: chef-rake-jobs
- name: openstack/cookbook-openstack-dashboard
template:
- name: merge-check
- name: chef-jobs
- name: chef-rake-jobs
- name: openstack/cookbook-openstack-data-processing
template:
- name: merge-check
- name: chef-jobs
- name: chef-rake-jobs
- name: openstack/cookbook-openstack-database
template:
- name: merge-check
- name: chef-jobs
- name: chef-rake-jobs
- name: openstack/cookbook-openstack-identity
template:
- name: merge-check
- name: chef-jobs
- name: chef-rake-jobs
- name: openstack/cookbook-openstack-image
template:
- name: merge-check
- name: chef-jobs
- name: chef-rake-jobs
- name: openstack/cookbook-openstack-integration-test
template:
- name: merge-check
- name: chef-jobs
- name: chef-rake-jobs
- name: openstack/cookbook-openstack-network
template:
- name: merge-check
- name: chef-jobs
- name: chef-rake-jobs
- name: openstack/cookbook-openstack-object-storage
template:
- name: merge-check
- name: chef-jobs
- name: chef-rake-jobs
- name: openstack/cookbook-openstack-ops-database
template:
- name: merge-check
- name: chef-jobs
- name: chef-rake-jobs
- name: openstack/cookbook-openstack-ops-messaging
template:
- name: merge-check
- name: chef-jobs
- name: chef-rake-jobs
- name: openstack/cookbook-openstack-orchestration
template:
- name: merge-check
- name: chef-jobs
- name: chef-rake-jobs
- name: openstack/cookbook-openstack-telemetry
template:
- name: merge-check
- name: chef-jobs
- name: chef-rake-jobs
- name: openstack/coreos-image-builder