79e04fedd7
Currently, the openstack_project::server class unconditionally ensures the 'puppet' package is installed. As long as we're using puppet 3, this is a noop: if puppet is running, then it's already installled. However, if we have installed puppet 4 from the puppetlabs repositories, then the puppet 4 package is actually called 'puppet-agent', and reinstalling the 'puppet' package from the distro repositories will clobber it. We could work around this in two ways: one is to add logic to the openstack_project::server class to manage the correct package name and correct package version based on a parameter or the current state of the system, and the other is to stop managing it entirely from puppet. Since we're already managing it from ansible, let's go with the less-puppet-code option. This change also lets us make the puppet-4 system-config-specific beaker jobs voting. Change-Id: I32c02302a5009dcd3a54fae7fb346f2214be886a
38 lines
1.3 KiB
YAML
38 lines
1.3 KiB
YAML
- job:
|
|
name: puppet-beaker-rspec-infra-system-config
|
|
parent: puppet-beaker-rspec-infra
|
|
vars:
|
|
project_src_dir: "{{ zuul.project.src_dir }}/modules/openstack_project"
|
|
|
|
- job:
|
|
name: puppet-beaker-rspec-infra-centos-7-system-config
|
|
parent: puppet-beaker-rspec-centos-7-infra
|
|
vars:
|
|
project_src_dir: "{{ zuul.project.src_dir }}/modules/openstack_project"
|
|
|
|
- job:
|
|
name: puppet-beaker-rspec-puppet-4-infra-system-config
|
|
parent: puppet-beaker-rspec-puppet-4-infra
|
|
vars:
|
|
project_src_dir: "{{ zuul.project.src_dir }}/modules/openstack_project"
|
|
|
|
- job:
|
|
name: puppet-beaker-rspec-puppet-4-centos-7-infra-system-config
|
|
parent: puppet-beaker-rspec-puppet-4-infra
|
|
vars:
|
|
project_src_dir: "{{ zuul.project.src_dir }}/modules/openstack_project"
|
|
|
|
- project:
|
|
check:
|
|
jobs:
|
|
- puppet-beaker-rspec-infra-system-config
|
|
- puppet-beaker-rspec-infra-centos-7-system-config
|
|
- puppet-beaker-rspec-puppet-4-infra-system-config
|
|
- puppet-beaker-rspec-puppet-4-centos-7-infra-system-config
|
|
gate:
|
|
jobs:
|
|
- puppet-beaker-rspec-infra-system-config
|
|
- puppet-beaker-rspec-infra-centos-7-system-config
|
|
- puppet-beaker-rspec-puppet-4-infra-system-config
|
|
- puppet-beaker-rspec-puppet-4-centos-7-infra-system-config
|