Add CentOS 7 for integration check and gate jobs
I'd really like to re-enable integration tests for CentOS since we use it quite a bit. This should also hopefully catch any issues that might be missed. Change-Id: I2be43a81c5c8d4e36253b740affe7223f7a54acd Signed-off-by: Lance Albertson <lance@osuosl.org>
This commit is contained in:
parent
d1d1139f15
commit
d3a307d917
20
.zuul.yaml
20
.zuul.yaml
|
@ -8,8 +8,9 @@
|
||||||
timeout: 1800
|
timeout: 1800
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: openstack-chef-integration
|
name: openstack-chef-integration-ubuntu
|
||||||
parent: base
|
parent: base
|
||||||
|
nodeset: ubuntu-bionic
|
||||||
description: Run integration tests with openstack-chef on Ubuntu Bionic
|
description: Run integration tests with openstack-chef on Ubuntu Bionic
|
||||||
required-projects: openstack/openstack-chef
|
required-projects: openstack/openstack-chef
|
||||||
pre-run: playbooks/pre-integration.yaml
|
pre-run: playbooks/pre-integration.yaml
|
||||||
|
@ -17,16 +18,29 @@
|
||||||
post-run: playbooks/post.yaml
|
post-run: playbooks/post.yaml
|
||||||
timeout: 5400
|
timeout: 5400
|
||||||
|
|
||||||
|
- job:
|
||||||
|
name: openstack-chef-integration-centos
|
||||||
|
parent: base
|
||||||
|
nodeset: centos-7
|
||||||
|
description: Run integration tests with openstack-chef on CentOS 7
|
||||||
|
required-projects: openstack/openstack-chef
|
||||||
|
pre-run: playbooks/pre-integration.yaml
|
||||||
|
run: playbooks/integration.yaml
|
||||||
|
post-run: playbooks/post.yaml
|
||||||
|
timeout: 5400
|
||||||
|
|
||||||
- project-template:
|
- project-template:
|
||||||
name: openstack-chef-jobs
|
name: openstack-chef-jobs
|
||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
- openstack-chef-delivery
|
- openstack-chef-delivery
|
||||||
- openstack-chef-integration
|
- openstack-chef-integration-ubuntu
|
||||||
|
- openstack-chef-integration-centos
|
||||||
gate:
|
gate:
|
||||||
jobs:
|
jobs:
|
||||||
- openstack-chef-delivery
|
- openstack-chef-delivery
|
||||||
- openstack-chef-integration
|
- openstack-chef-integration-ubuntu
|
||||||
|
- openstack-chef-integration-centos
|
||||||
|
|
||||||
- project:
|
- project:
|
||||||
templates:
|
templates:
|
||||||
|
|
2
Rakefile
2
Rakefile
|
@ -127,7 +127,7 @@ end
|
||||||
|
|
||||||
def _save_logs(prefix, log_dir)
|
def _save_logs(prefix, log_dir)
|
||||||
sh %(sleep 25)
|
sh %(sleep 25)
|
||||||
%w(nova neutron keystone glance apache2 rabbitmq mysql mysql-default openvswitch mariadb).each do |project|
|
%w(nova neutron keystone glance httpd apache2 rabbitmq mysql mysql-default openvswitch mariadb).each do |project|
|
||||||
sh %(mkdir -p #{log_dir}/#{prefix}/#{project})
|
sh %(mkdir -p #{log_dir}/#{prefix}/#{project})
|
||||||
sh %(sudo cp -rL /etc/#{project} #{log_dir}/#{prefix}/#{project}/etc || true)
|
sh %(sudo cp -rL /etc/#{project} #{log_dir}/#{prefix}/#{project}/etc || true)
|
||||||
sh %(sudo cp -rL /var/log/#{project} #{log_dir}/#{prefix}/#{project}/log || true)
|
sh %(sudo cp -rL /var/log/#{project} #{log_dir}/#{prefix}/#{project}/log || true)
|
||||||
|
|
|
@ -11,11 +11,6 @@
|
||||||
"install": {
|
"install": {
|
||||||
"version": "10.1"
|
"version": "10.1"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"yum": {
|
|
||||||
"epel": {
|
|
||||||
"enabled": false
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"override_attributes": {
|
"override_attributes": {
|
||||||
|
|
Loading…
Reference in New Issue