Showing with 149 additions and 240 deletions.
  1. +0 −68 .github/workflows/acceptance.yml
  2. +79 −0 .github/workflows/ci.yml
  3. +0 −117 .github/workflows/cron.yml
  4. +0 −44 .github/workflows/unit.yml
  5. +8 −0 CHANGELOG.md
  6. +2 −1 Gemfile
  7. +32 −0 HISTORY.md
  8. +3 −3 README.md
  9. +17 −6 manifests/plugin/dynflow.pp
  10. +1 −1 metadata.json
  11. +7 −0 spec/classes/foreman_proxy__plugin__dynflow_spec.rb
68 changes: 0 additions & 68 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 false

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 }}
117 changes: 0 additions & 117 deletions .github/workflows/cron.yml

This file was deleted.

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

This file was deleted.

8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog

## [17.1.1](https://github.com/theforeman/puppet-foreman_proxy/tree/17.1.1) (2021-03-18)

[Full Changelog](https://github.com/theforeman/puppet-foreman_proxy/compare/17.1.0...17.1.1)

**Fixed bugs:**

- Fixes [\#32078](https://projects.theforeman.org/issues/32078) - explicitly notify dynflow core service on changes [\#653](https://github.com/theforeman/puppet-foreman_proxy/pull/653) ([evgeni](https://github.com/evgeni))

## [17.1.0](https://github.com/theforeman/puppet-foreman_proxy/tree/17.1.0) (2021-02-04)

[Full Changelog](https://github.com/theforeman/puppet-foreman_proxy/compare/17.0.0...17.1.0)
Expand Down
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ gem 'puppet-lint-strict_indent-check', {"groups"=>["test"]}
gem 'puppet-lint-undef_in_function-check', {"groups"=>["test"]}
gem 'voxpupuli-test', '~> 1.4'
gem 'github_changelog_generator', '>= 1.15.0', {"groups"=>["development"]}
gem 'puppet_metadata', '~> 0.3'
gem 'puppet-blacksmith', '>= 6.0.0', {"groups"=>["development"]}
gem 'voxpupuli-acceptance', '~> 0.2', {"groups"=>["system_tests"]}
gem 'voxpupuli-acceptance', '~> 0.3', {"groups"=>["system_tests"]}

# vim:ft=ruby
32 changes: 32 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,35 @@
## [17.1.1](https://github.com/theforeman/puppet-foreman_proxy/tree/17.1.1) (2021-03-18)

[Full Changelog](https://github.com/theforeman/puppet-foreman_proxy/compare/17.1.0...17.1.1)

**Fixed bugs:**

- Fixes [\#32078](https://projects.theforeman.org/issues/32078) - explicitly notify dynflow core service on changes [\#653](https://github.com/theforeman/puppet-foreman_proxy/pull/653) ([evgeni](https://github.com/evgeni))

## [17.1.0](https://github.com/theforeman/puppet-foreman_proxy/tree/17.1.0) (2021-02-04)

[Full Changelog](https://github.com/theforeman/puppet-foreman_proxy/compare/17.0.0...17.1.0)

**Implemented enhancements:**

- Fixes [\#31642](https://projects.theforeman.org/issues/31642) - Add container gateway support [\#643](https://github.com/theforeman/puppet-foreman_proxy/pull/643) ([ianballou](https://github.com/ianballou))

## [17.0.0](https://github.com/theforeman/puppet-foreman_proxy/tree/17.0.0) (2021-01-29)

[Full Changelog](https://github.com/theforeman/puppet-foreman_proxy/compare/16.0.0...17.0.0)

**Breaking changes:**

- Fixes [\#30449](https://projects.theforeman.org/issues/30449) - Do not require TFTP for HTTPBoot [\#608](https://github.com/theforeman/puppet-foreman_proxy/pull/608) ([ekohl](https://github.com/ekohl))

**Implemented enhancements:**

- Fixes [\#31415](https://projects.theforeman.org/issues/31415) - Expose DHCP's ping\_free\_ip option [\#635](https://github.com/theforeman/puppet-foreman_proxy/pull/635) ([ekohl](https://github.com/ekohl))

**Fixed bugs:**

- Fixes [\#31430](https://projects.theforeman.org/issues/31430) - use correct key and server for ansible-runner deb [\#637](https://github.com/theforeman/puppet-foreman_proxy/pull/637) ([evgeni](https://github.com/evgeni))

## [16.0.0](https://github.com/theforeman/puppet-foreman_proxy/tree/16.0.0) (2020-10-30)

[Full Changelog](https://github.com/theforeman/puppet-foreman_proxy/compare/15.3.0...16.0.0)
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[![Puppet Forge](https://img.shields.io/puppetforge/v/theforeman/foreman_proxy.svg)](https://forge.puppetlabs.com/theforeman/foreman_proxy)
[![Build Status](https://travis-ci.org/theforeman/puppet-foreman_proxy.svg?branch=master)](https://travis-ci.org/theforeman/puppet-foreman_proxy)
[![CI](https://github.com/theforeman/puppet-foreman_proxy/actions/workflows/ci.yml/badge.svg)](https://github.com/theforeman/puppet-foreman_proxy/actions/workflows/ci.yml)

# Puppet module for managing the Foreman Smart Proxy

Expand All @@ -12,8 +12,8 @@ Part of the Foreman installer: <https://github.com/theforeman/foreman-installer>

| Module version | Proxy versions | Notes |
|----------------|----------------|-----------------------------------------------------|
| 16.x | 2.3 and newer | See compatibility notes in its README for 2.0-2.2 |
| 13.x | 2.0 - 2.2 | |
| 16.x - 17.x | 2.3 and newer | See compatibility notes in its README for 2.0-2.2 |
| 13.x - 15.x | 2.0 - 2.2 | |
| 12.x | 1.19 - 1.24 | See compatibility notes in its README for 1.19-1.22 |
| 11.x | 1.19 - 1.23 | See compatibility notes in its README for 1.19-1.21 |
| 10.x | 1.19 - 1.21 | |
Expand Down
Loading