puppet: run beaker on both trusty & centos7

This patch aims to run Beaker on both Ubuntu & CentOS7 using nodepool,
without vagrant.

* Split beaker-rspec jobs in 2 (trusty & centos7) with a new job-group
* Switch from bare-trusty to devstack-trusty
* Ability to uninstall Puppet on YUM systems
* Ability to install beaker dependencies (Ruby & Devel tools) on YUM systems
* Delete beaker jobs where there is no beaker tests (save time &
  resources.)

Change-Id: I56b1e9b5554e5b56a8c20dacd0f89d4f0321edcc
This commit is contained in:
Emilien Macchi 2015-04-20 10:54:14 -04:00
parent 64a0bd1966
commit 2010db4b32
4 changed files with 43 additions and 35 deletions

@ -141,7 +141,12 @@
- builder:
name: uninstall-puppet
builders:
- shell: "sudo apt-get remove -y --purge facter puppet puppet-common"
- shell: |
if [ -f /usr/bin/yum ]; then
sudo yum -y remove facter puppet
elif [ -f /usr/bin/apt-get ]; then
sudo apt-get remove -y --purge facter puppet puppet-common
fi
- builder:
name: puppet-lint

@ -2831,7 +2831,6 @@
jobs:
- puppet-check-jobs
- gate-{name}-puppet-beaker-rspec
- '{name}-forge-upload'
- project:
@ -4570,7 +4569,7 @@
jobs:
- puppet-check-jobs
- puppet-module-unit
- gate-{name}-puppet-beaker-rspec
- puppet-beaker-jobs
- gate-{name}-puppet-syntax-future
- project:
@ -4581,7 +4580,7 @@
jobs:
- puppet-check-jobs
- puppet-module-unit
- gate-{name}-puppet-beaker-rspec
- puppet-beaker-jobs
- gate-{name}-puppet-syntax-future
- project:
@ -4592,7 +4591,7 @@
jobs:
- puppet-check-jobs
- puppet-module-unit
- gate-{name}-puppet-beaker-rspec
- puppet-beaker-jobs
- gate-{name}-puppet-syntax-future
- project:
@ -4603,7 +4602,7 @@
jobs:
- puppet-check-jobs
- puppet-module-unit
- gate-{name}-puppet-beaker-rspec
- puppet-beaker-jobs
- gate-{name}-puppet-syntax-future
- project:
@ -4614,7 +4613,7 @@
jobs:
- puppet-check-jobs
- puppet-module-unit
- gate-{name}-puppet-beaker-rspec
- puppet-beaker-jobs
- gate-{name}-puppet-syntax-future
- project:
@ -4635,7 +4634,7 @@
jobs:
- puppet-check-jobs
- puppet-module-unit
- gate-{name}-puppet-beaker-rspec
- puppet-beaker-jobs
- gate-{name}-puppet-syntax-future
- project:
@ -4646,7 +4645,7 @@
jobs:
- puppet-check-jobs
- puppet-module-unit
- gate-{name}-puppet-beaker-rspec
- puppet-beaker-jobs
- gate-{name}-puppet-syntax-future
- project:
@ -4657,7 +4656,7 @@
jobs:
- puppet-check-jobs
- puppet-module-unit
- gate-{name}-puppet-beaker-rspec
- puppet-beaker-jobs
- gate-{name}-puppet-syntax-future
- project:
@ -4668,7 +4667,7 @@
jobs:
- puppet-check-jobs
- puppet-module-unit
- gate-{name}-puppet-beaker-rspec
- puppet-beaker-jobs
- gate-{name}-puppet-syntax-future
- project:
@ -4679,7 +4678,7 @@
jobs:
- puppet-check-jobs
- puppet-module-unit
- gate-{name}-puppet-beaker-rspec
- puppet-beaker-jobs
- gate-{name}-puppet-syntax-future
- project:
@ -4690,7 +4689,6 @@
jobs:
- puppet-check-jobs
- puppet-module-unit
- gate-{name}-puppet-beaker-rspec
- gate-{name}-puppet-syntax-future
- project:
@ -4701,7 +4699,6 @@
jobs:
- puppet-check-jobs
- puppet-module-unit
- gate-{name}-puppet-beaker-rspec
- gate-{name}-puppet-syntax-future
- project:
@ -4712,7 +4709,6 @@
jobs:
- puppet-check-jobs
- puppet-module-unit
- gate-{name}-puppet-beaker-rspec
- gate-{name}-puppet-syntax-future
- project:
@ -4723,7 +4719,7 @@
jobs:
- puppet-check-jobs
- puppet-module-unit
- gate-{name}-puppet-beaker-rspec
- puppet-beaker-jobs
- gate-{name}-puppet-syntax-future
- project:
@ -4734,7 +4730,7 @@
jobs:
- puppet-check-jobs
- puppet-module-unit
- gate-{name}-puppet-beaker-rspec
- puppet-beaker-jobs
- gate-{name}-puppet-syntax-future
- project:
@ -4772,7 +4768,6 @@
jobs:
- puppet-check-jobs
- puppet-module-unit
- gate-{name}-puppet-beaker-rspec
- gate-{name}-puppet-syntax-future
- project:
@ -4783,7 +4778,7 @@
jobs:
- puppet-check-jobs
- puppet-module-unit
- gate-{name}-puppet-beaker-rspec
- puppet-beaker-jobs
- gate-{name}-puppet-syntax-future
- project:
@ -4794,7 +4789,7 @@
jobs:
- puppet-check-jobs
- puppet-module-unit
- gate-{name}-puppet-beaker-rspec
- puppet-beaker-jobs
- gate-{name}-puppet-syntax-future
- project:
@ -4813,7 +4808,7 @@
jobs:
- puppet-check-jobs
- puppet-module-unit
- gate-{name}-puppet-beaker-rspec
- puppet-beaker-jobs
- gate-{name}-puppet-syntax-future
- project:
@ -4824,7 +4819,7 @@
jobs:
- puppet-check-jobs
- puppet-module-unit
- gate-{name}-puppet-beaker-rspec
- puppet-beaker-jobs
- gate-{name}-puppet-syntax-future
- project:
@ -4844,7 +4839,7 @@
jobs:
- puppet-check-jobs
- puppet-module-unit
- gate-{name}-puppet-beaker-rspec
- puppet-beaker-jobs
- gate-{name}-puppet-syntax-future
- project:
@ -4865,7 +4860,7 @@
jobs:
- puppet-check-jobs
- puppet-module-unit
- gate-{name}-puppet-beaker-rspec
- puppet-beaker-jobs
- gate-{name}-puppet-syntax-future
- project:

@ -23,13 +23,18 @@
- job-template:
name: 'gate-{name}-puppet-beaker-rspec'
node: '{node}'
name: 'gate-{name}-puppet-beaker-rspec-dsvm-{ostype}'
node: 'devstack-{ostype}'
builders:
- uninstall-puppet
- shell: |
sudo apt-get install -y libxml2-dev libxslt-dev
if [ -f /usr/bin/yum ]; then
sudo yum -y install libxml2-devel libxslt-devel ruby-devel
sudo yum -y groupinstall "Development Tools"
elif [ -f /usr/bin/apt-get ]; then
sudo apt-get install -y libxml2-dev libxslt-dev
fi
- gerrit-git-prep
- shell: |
echo "" | sudo tee -a /etc/ssh/sshd_config
@ -141,3 +146,11 @@
- 4.0
jobs:
- 'gate-{name}-puppet-unit-{puppet_version}'
- job-group:
name: 'puppet-beaker-jobs'
ostype:
- trusty
- centos7
jobs:
- 'gate-{name}-puppet-beaker-rspec-dsvm-{ostype}'

@ -465,7 +465,8 @@ project-templates:
- name: puppet-beaker-jobs
check:
- gate-{name}-puppet-beaker-rspec
- gate-{name}-puppet-beaker-rspec-dsvm-trusty
- gate-{name}-puppet-beaker-rspec-dsvm-centos7
- name: puppet-syntax-future
check:
@ -1030,7 +1031,7 @@ jobs:
- name: ^gate-puppet-.*-puppet-unit-4.0$
voting: false
# Beaker tests have been introduced after Juno release
- name: ^gate-puppet-.*-puppet-beaker-rspec$
- name: ^gate-puppet-.*-puppet-beaker-rspec-dsvm-.*$
branch: ^(?!stable/(havana|icehouse|juno)).*$
voting: false
- name: ^gate-puppet-.*-puppet-syntax-future$
@ -4296,8 +4297,6 @@ projects:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-apply-jobs
check:
- gate-puppet-storyboard-puppet-beaker-rspec
release:
- puppet-storyboard-forge-upload
@ -6305,7 +6304,6 @@ projects:
- name: merge-check
- name: puppet-check-jobs
- name: puppet-module-unit-jobs
- name: puppet-beaker-jobs
- name: puppet-syntax-future
- name: stackforge/puppet-murano
@ -6313,7 +6311,6 @@ projects:
- name: merge-check
- name: puppet-check-jobs
- name: puppet-module-unit-jobs
- name: puppet-beaker-jobs
- name: puppet-syntax-future
- name: stackforge/puppet-n1k-vsm
@ -6321,7 +6318,6 @@ projects:
- name: merge-check
- name: puppet-check-jobs
- name: puppet-module-unit-jobs
- name: puppet-beaker-jobs
- name: puppet-syntax-future
- name: stackforge/puppet-neutron
@ -6377,7 +6373,6 @@ projects:
- name: merge-check
- name: puppet-check-jobs
- name: puppet-module-unit-jobs
- name: puppet-beaker-jobs
- name: puppet-syntax-future
- name: stackforge/puppet-openstack-specs