openstack/project-config
Code Issues Proposed changes

Chef: adds basic multinode integration tests

Browse Source 
- renames chef-test-jobs to chef-rake-jobs for consistency
- adds multinode integration jobs
- changes gerrit-git-prep to zuul-git-prep as zuul-git-prep is preferred
- removes aio periodic gates

Change-Id: I0c316804a2eea2574681778678a8599203007c0d
This commit is contained in:
Samuel Cassiba 2017-03-14 07:59:35 -07:00
parent c0fcae544a
commit 9c35299af8
4 changed files with 35 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,7 +36,7 @@
builders:
- print-template-name:
template-name: '{template-name}'
- gerrit-git-prep
- zuul-git-prep
- install-distro-packages
- chef-bootstrap
- chef-rake-integration
@ -46,7 +46,7 @@
- console-log
- job-template:
name: periodic-{name}-chef-rake-integration-{node}
name: gate-{name}-chef-rake-integration-multinode-{node-release}-nv
node: '{node}'
wrappers:
@ -57,10 +57,9 @@
builders:
- print-template-name:
template-name: '{template-name}'
- branch-git-prep:
branch: master
- zuul-git-prep
- install-distro-packages
- chef-bootstrap
- chef-bootstrap-multinode
- chef-rake-integration
publishers:
@ -68,10 +67,16 @@
- console-log
- job-group:
name: chef-test-jobs
name: chef-rake-jobs
jobs:
- gate-{name}-chef-rake
- gate-{name}-chef-rake-integration-{node}-nv:
node:
- centos-7
- ubuntu-xenial
- 'gate-{name}-chef-rake-integration-multinode-{node-release}-nv':
node-release: centos-7
node: centos-7-2-node
- 'gate-{name}-chef-rake-integration-multinode-{node-release}-nv':
node-release: ubuntu-xenial
node: ubuntu-xenial-2-node

9
jenkins/jobs/macros.yaml
View File

@ -630,7 +630,14 @@
builders:
- shell: |
#!/bin/bash -x
./bootstrap.sh
./bootstrap.sh allinone
- builder:
name: chef-bootstrap-multinode
builders:
- shell: |
#!/bin/bash -x
./bootstrap.sh multinode
- builder:
name: chef-rake-test

34
jenkins/jobs/projects.yaml
View File

@ -1397,85 +1397,85 @@
name: cookbook-openstack-application-catalog
jobs:
- chef-test-jobs
- chef-rake-jobs
- project:
name: cookbook-openstack-block-storage
jobs:
- chef-test-jobs
- chef-rake-jobs
- project:
name: cookbook-openstack-client
jobs:
- chef-test-jobs
- chef-rake-jobs
- project:
name: cookbook-openstack-common
jobs:
- chef-test-jobs
- chef-rake-jobs
- project:
name: cookbook-openstack-compute
jobs:
- chef-test-jobs
- chef-rake-jobs
- project:
name: cookbook-openstack-dashboard
jobs:
- chef-test-jobs
- chef-rake-jobs
- project:
name: cookbook-openstack-identity
jobs:
- chef-test-jobs
- chef-rake-jobs
- project:
name: cookbook-openstack-image
jobs:
- chef-test-jobs
- chef-rake-jobs
- project:
name: cookbook-openstack-integration-test
jobs:
- chef-test-jobs
- chef-rake-jobs
- project:
name: cookbook-openstack-network
jobs:
- chef-test-jobs
- chef-rake-jobs
- project:
name: cookbook-openstack-ops-database
jobs:
- chef-test-jobs
- chef-rake-jobs
- project:
name: cookbook-openstack-ops-messaging
jobs:
- chef-test-jobs
- chef-rake-jobs
- project:
name: cookbook-openstack-orchestration
jobs:
- chef-test-jobs
- chef-rake-jobs
- project:
name: cookbook-openstack-telemetry
jobs:
- chef-test-jobs
- chef-rake-jobs
- project:
name: coupler
@ -9081,11 +9081,7 @@
name: openstack-chef-repo
jobs:
- chef-test-jobs
- periodic-{name}-chef-rake-integration-{node}:
node:
- centos-7
- ubuntu-xenial
- chef-rake-jobs
- project:
name: openstack-chef-specs

4
zuul/layout.yaml
View File

@ -744,6 +744,7 @@ project-templates:
- 'gate-{name}-chef-rake'
- 'gate-{name}-chef-rake-integration-centos-7-nv'
- 'gate-{name}-chef-rake-integration-ubuntu-xenial-nv'
- 'gate-{name}-chef-rake-integration-multinode-ubuntu-xenial-nv'
gate:
- 'gate-{name}-chef-rake'
@ -14048,9 +14049,6 @@ projects:
template:
- name: merge-check
- name: chef-rake-jobs
periodic:
- periodic-openstack-chef-repo-chef-rake-integration-centos-7
- periodic-openstack-chef-repo-chef-rake-integration-ubuntu-xenial
- name: openstack/openstack-chef-specs
template: