Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

allow puppet/python 4.x / use puppet/epel instead of stahnma-epel #280

Closed
wants to merge 3 commits into from
Closed

allow puppet/python 4.x / use puppet/epel instead of stahnma-epel #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
700b5ab
allow puppet/python 4.x
bastelfreak Apr 26, 2020
484d5a4
use puppet/epel instead of stahnma-epel
bastelfreak Apr 26, 2020
3a4691a
Add Ubuntu 18 support
bastelfreak Apr 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .fixtures.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ fixtures:
concat: https://github.com/puppetlabs/puppetlabs-concat.git
vcsrepo: https://github.com/puppetlabs/puppetlabs-vcsrepo.git
python: https://github.com/voxpupuli/puppet-python.git
epel: https://github.com/stahnma/puppet-module-epel.git
epel: https://github.com/voxpupuli/puppet-epel.git
apache: https://github.com/puppetlabs/puppetlabs-apache.git
selinux_core:
repo: https://github.com/puppetlabs/puppetlabs-selinux_core.git
Expand Down
1 change: 1 addition & 0 deletions .sync.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
secure: "Hw0ScFZ+tANSuxXvkQlHOtbnV+9O6FyIxY4e8ZuNiE+4E045olgGjqus+ffo0MoHOHzCPPbThF107yQIXXHCwIy3wzOVIjQ7KQ/yVeamCl4K9A4AFP1Pcr/zMTRdK16zrgxBH+6wDkjSxHGonT8AyUKBrT7AeET+pqxwVHvHCfo="
docker_sets:
- set: ubuntu1604-64
- set: ubuntu1804-64
- set: centos7-64
8 changes: 8 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,14 @@ matrix:
bundler_args: --without development release
env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=ubuntu1604-64 BEAKER_HYPERVISOR=docker CHECK=beaker
services: docker
- rvm: 2.5.3
bundler_args: --without development release
env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=ubuntu1804-64 BEAKER_HYPERVISOR=docker CHECK=beaker
services: docker
- rvm: 2.5.3
bundler_args: --without development release
env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=ubuntu1804-64 BEAKER_HYPERVISOR=docker CHECK=beaker
services: docker
- rvm: 2.5.3
bundler_args: --without development release
env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=centos7-64 BEAKER_HYPERVISOR=docker CHECK=beaker
Expand Down
5 changes: 3 additions & 2 deletions metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@
"operatingsystem": "Ubuntu",
"operatingsystemrelease": [
"14.04",
"16.04"
"16.04",
"18.04"
]
},
{
Expand All @@ -67,7 +68,7 @@
},
{
"name": "puppet/python",
"version_requirement": ">= 1.12.0 < 4.0.0"
"version_requirement": ">= 1.12.0 < 5.0.0"
},
{
"name": "puppetlabs/vcsrepo",
Expand Down
2 changes: 1 addition & 1 deletion spec/spec_helper_acceptance.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@

# Install additional modules for soft deps
install_module_from_forge('puppetlabs-apache', '>= 2.1.0 < 6.0.0')
install_module_from_forge('stahnma-epel', '>= 1.2.2 < 2.0.0')
install_module_from_forge('puppet-epel', '>= 3.0.0 < 4.0.0')
end
end