18 changes: 7 additions & 11 deletions .fixtures.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,10 @@ fixtures:
cron_core:
repo: 'https://github.com/puppetlabs/puppetlabs-cron_core'
puppet_version: '>= 6.0.0'
extlib: 'https://github.com/voxpupuli/puppet-extlib.git'
foreman: 'https://github.com/theforeman/puppet-foreman.git'
git: 'https://github.com/theforeman/puppet-git.git'
inifile: 'https://github.com/puppetlabs/puppetlabs-inifile.git'
puppetdb: 'https://github.com/puppetlabs/puppetlabs-puppetdb.git'
redis: 'https://github.com/voxpupuli/puppet-redis.git'
stdlib: 'https://github.com/puppetlabs/puppetlabs-stdlib.git'
systemd: 'https://github.com/camptocamp/puppet-systemd.git'
yumrepo_core:
repo: 'https://github.com/puppetlabs/puppetlabs-yumrepo_core'
puppet_version: '>= 6.0.0'
extlib: 'https://github.com/voxpupuli/puppet-extlib.git'
git: 'https://github.com/theforeman/puppet-git.git'
inifile: 'https://github.com/puppetlabs/puppetlabs-inifile.git'
puppetdb: 'https://github.com/puppetlabs/puppetlabs-puppetdb.git'
puppetserver_foreman: 'https://github.com/theforeman/puppet-puppetserver_foreman.git'
stdlib: 'https://github.com/puppetlabs/puppetlabs-stdlib.git'
systemd: 'https://github.com/camptocamp/puppet-systemd.git'
77 changes: 0 additions & 77 deletions .github/workflows/acceptance.yml

This file was deleted.

79 changes: 79 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
name: CI

on:
pull_request:
schedule:
- cron: '4 4 * * *'

jobs:
setup_matrix:
if: github.event_name != 'schedule' || github.repository_owner == 'theforeman'
name: 'Setup Test Matrix'
runs-on: ubuntu-latest
outputs:
beaker_setfiles: ${{ steps.get_outputs.outputs.beaker_setfiles }}
puppet_major_versions: ${{ steps.get_outputs.outputs.puppet_major_versions }}
puppet_unit_test_matrix: ${{ steps.get_outputs.outputs.puppet_unit_test_matrix }}
env:
BUNDLE_WITHOUT: development:release
steps:
- uses: actions/checkout@v2
- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '2.7'
bundler-cache: true
- name: Run rake check
run: bundle exec rake check
- name: Run rake validate
run: bundle exec rake validate
- name: Run rake lint
run: bundle exec rake lint
- name: Setup Test Matrix
id: get_outputs
run: bundle exec metadata2gha --use-fqdn --pidfile-workaround true

unit:
needs: setup_matrix
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
include: ${{fromJson(needs.setup_matrix.outputs.puppet_unit_test_matrix)}}
env:
BUNDLE_WITHOUT: development:system_tests:release
PUPPET_VERSION: "${{ matrix.puppet }}.0"
name: Unit / Puppet ${{ matrix.puppet }} (Ruby ${{ matrix.ruby }})
steps:
- uses: actions/checkout@v2
- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
bundler-cache: true
- name: Run tests
run: bundle exec rake parallel_spec

acceptance:
needs: setup_matrix
runs-on: ubuntu-latest
env:
BUNDLE_WITHOUT: development:test:release
strategy:
fail-fast: false
matrix:
setfile: ${{fromJson(needs.setup_matrix.outputs.beaker_setfiles)}}
puppet: ${{fromJson(needs.setup_matrix.outputs.puppet_major_versions)}}
name: Acceptance / ${{ matrix.puppet.name }} - ${{ matrix.setfile.name }}
steps:
- uses: actions/checkout@v2
- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '2.7'
bundler-cache: true
- name: Run tests
run: bundle exec rake beaker
env:
BEAKER_PUPPET_COLLECTION: ${{ matrix.puppet.collection }}
BEAKER_setfile: ${{ matrix.setfile.value }}
126 changes: 0 additions & 126 deletions .github/workflows/cron.yml

This file was deleted.

44 changes: 0 additions & 44 deletions .github/workflows/unit.yml

This file was deleted.

14 changes: 1 addition & 13 deletions .sync.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,5 @@
---
.github/workflows/acceptance.yml:
excludes:
- setfile: debian10-64{hostname=debian10-64.example.com}
puppet: "5"
- setfile: ubuntu2004-64{hostname=ubuntu2004-64.example.com}
puppet: "5"
pidfile_workaround: true
.github/workflows/cron.yml:
excludes:
- setfile: debian10-64{hostname=debian10-64.example.com}
puppet: "5"
- setfile: ubuntu2004-64{hostname=ubuntu2004-64.example.com}
puppet: "5"
.github/workflows/ci.yml:
pidfile_workaround: true
Gemfile:
extra:
Expand Down
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,22 @@
# Changelog

## [15.0.0](https://github.com/theforeman/puppet-puppet/tree/15.0.0) (2021-04-26)

[Full Changelog](https://github.com/theforeman/puppet-puppet/compare/14.2.1...15.0.0)

**Breaking changes:**

- \(\#780\) puppetserver: don't purge metrics.conf / Use dedicated parameter for jruby profiler [\#781](https://github.com/theforeman/puppet-puppet/pull/781) ([bastelfreak](https://github.com/bastelfreak))
- Move to puppetserver\_foreman [\#749](https://github.com/theforeman/puppet-puppet/pull/749) ([ekohl](https://github.com/ekohl))

**Implemented enhancements:**

- Add `puppet::package_install_options` variable to allow you to pass flags to package resource [\#777](https://github.com/theforeman/puppet-puppet/pull/777) ([vollmerk](https://github.com/vollmerk))

**Fixed bugs:**

- Fix config append [\#782](https://github.com/theforeman/puppet-puppet/pull/782) ([SimonPe](https://github.com/SimonPe))

## [14.2.1](https://github.com/theforeman/puppet-puppet/tree/14.2.1) (2021-01-26)

[Full Changelog](https://github.com/theforeman/puppet-puppet/compare/14.2.0...14.2.1)
Expand Down
Loading