Showing with 171 additions and 164 deletions.
  1. +43 −0 .github/workflows/release.yml
  2. +1 −0 .gitignore
  3. +1 −0 .pdkignore
  4. +0 −23 .project
  5. +98 −107 .sync.yml
  6. +6 −17 .travis.yml
  7. +13 −4 CHANGELOG.md
  8. +0 −1 Gemfile
  9. +0 −6 MAINTAINERS.md
  10. +1 −0 appveyor.yml
  11. +6 −4 metadata.json
  12. +2 −2 provision.yaml
43 changes: 43 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: "release"

on:
push:
branches:
- 'release'

jobs:
LitmusAcceptance:
runs-on: self-hosted
strategy:
matrix:
ruby_version: [2.5.x]
puppet_gem_version: [~> 6.0]
platform: [release_checks]
agent_family: ['puppet5', 'puppet6']

steps:
- uses: actions/checkout@v1
- name: Litmus Parallel
uses: puppetlabs/action-litmus_parallel@master
with:
platform: ${{ matrix.platform }}
agent_family: ${{ matrix.agent_family }}
Spec:
runs-on: self-hosted
strategy:
matrix:
check: [parallel_spec, 'syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop']
ruby_version: [2.5.x]
puppet_gem_version: [~> 5.0, ~> 6.0]
exclude:
- puppet_gem_version: ~> 5.0
check: 'syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop'
- ruby_version: 2.5.x
puppet_gem_version: ~> 5.0
steps:
- uses: actions/checkout@v1
- name: Spec Tests
uses: puppetlabs/action-litmus_spec@master
with:
puppet_gem_version: ${{ matrix.puppet_gem_version }}
check: ${{ matrix.check }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,6 @@
/convert_report.txt
/update_report.txt
.DS_Store
.project
.envrc
/inventory.yaml
1 change: 1 addition & 0 deletions .pdkignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
/convert_report.txt
/update_report.txt
.DS_Store
.project
.envrc
/inventory.yaml
/appveyor.yml
Expand Down
23 changes: 0 additions & 23 deletions .project

This file was deleted.

205 changes: 98 additions & 107 deletions .sync.yml
Original file line number Diff line number Diff line change
@@ -1,115 +1,106 @@
---
.gitignore:
required:
- ---.project

.gitlab-ci.yml:
unmanaged: true

.travis.yml:
user: puppet
secure: ""
".gitlab-ci.yml":
delete: true
".travis.yml":
deploy_to_forge:
enabled: false
branches:
- release
- release
includes:
-
bundler_args:
dist: trusty
env: PLATFORMS=debian_puppet5
rvm: 2.5.3
before_script:
- bundle exec rake 'litmus:provision_list[travis_deb]'
- bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*'
- bundle exec rake 'litmus:install_agent[puppet5]'
- bundle exec rake litmus:install_module
script:
- bundle exec rake litmus:acceptance:parallel
services: docker
sudo: required
stage: acceptance
-
bundler_args:
dist: trusty
env: PLATFORMS=debian_puppet6
rvm: 2.5.3
before_script:
- bundle exec rake 'litmus:provision_list[travis_deb]'
- bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*'
- bundle exec rake 'litmus:install_agent[puppet6]'
- bundle exec rake litmus:install_module
script:
- bundle exec rake litmus:acceptance:parallel
services: docker
sudo: required
stage: acceptance
-
bundler_args:
dist: trusty
env: PLATFORMS=el6_puppet5
rvm: 2.5.3
before_script:
- bundle exec rake 'litmus:provision_list[travis_el6]'
- bundle exec rake 'litmus:install_agent[puppet5]'
- bundle exec rake litmus:install_module
script:
- bundle exec rake litmus:acceptance:parallel
services: docker
sudo: required
stage: acceptance
-
bundler_args:
dist: trusty
env: PLATFORMS=el6_puppet6
rvm: 2.5.3
before_script:
- bundle exec rake 'litmus:provision_list[travis_el6]'
- bundle exec rake 'litmus:install_agent[puppet6]'
- bundle exec rake litmus:install_module
script:
- bundle exec rake litmus:acceptance:parallel
services: docker
sudo: required
stage: acceptance
-
bundler_args:
dist: trusty
env: PLATFORMS=el7_puppet5
rvm: 2.5.3
before_script:
- bundle exec rake 'litmus:provision_list[travis_el7]'
- bundle exec rake 'litmus:install_agent[puppet5]'
- bundle exec rake litmus:install_module
script:
- bundle exec rake litmus:acceptance:parallel
services: docker
sudo: required
stage: acceptance
-
bundler_args:
dist: trusty
env: PLATFORMS=el7_puppet6
rvm: 2.5.3
before_script:
- bundle exec rake 'litmus:provision_list[travis_el7]'
- bundle exec rake 'litmus:install_agent[puppet6]'
- bundle exec rake litmus:install_module
script:
- bundle exec rake litmus:acceptance:parallel
services: docker
sudo: required
stage: acceptance

- bundler_args:
dist: trusty
env: PLATFORMS=debian_puppet5
rvm: 2.5.3
before_script:
- bundle exec rake 'litmus:provision_list[travis_deb]'
- bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*'
- bundle exec rake 'litmus:install_agent[puppet5]'
- bundle exec rake litmus:install_module
script:
- bundle exec rake litmus:acceptance:parallel
services: docker
sudo: required
stage: acceptance
- bundler_args:
dist: trusty
env: PLATFORMS=debian_puppet6
rvm: 2.5.3
before_script:
- bundle exec rake 'litmus:provision_list[travis_deb]'
- bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*'
- bundle exec rake 'litmus:install_agent[puppet6]'
- bundle exec rake litmus:install_module
script:
- bundle exec rake litmus:acceptance:parallel
services: docker
sudo: required
stage: acceptance
- bundler_args:
dist: trusty
env: PLATFORMS=el6_puppet5
rvm: 2.5.3
before_script:
- bundle exec rake 'litmus:provision_list[travis_el6]'
- bundle exec rake 'litmus:install_agent[puppet5]'
- bundle exec rake litmus:install_module
script:
- bundle exec rake litmus:acceptance:parallel
services: docker
sudo: required
stage: acceptance
- bundler_args:
dist: trusty
env: PLATFORMS=el6_puppet6
rvm: 2.5.3
before_script:
- bundle exec rake 'litmus:provision_list[travis_el6]'
- bundle exec rake 'litmus:install_agent[puppet6]'
- bundle exec rake litmus:install_module
script:
- bundle exec rake litmus:acceptance:parallel
services: docker
sudo: required
stage: acceptance
- bundler_args:
dist: trusty
env: PLATFORMS=el7_puppet5
rvm: 2.5.3
before_script:
- bundle exec rake 'litmus:provision_list[travis_el7]'
- bundle exec rake 'litmus:install_agent[puppet5]'
- bundle exec rake litmus:install_module
script:
- bundle exec rake litmus:acceptance:parallel
services: docker
sudo: required
stage: acceptance
- bundler_args:
dist: trusty
env: PLATFORMS=el7_puppet6
rvm: 2.5.3
before_script:
- bundle exec rake 'litmus:provision_list[travis_el7]'
- bundle exec rake 'litmus:install_agent[puppet6]'
- bundle exec rake litmus:install_module
script:
- bundle exec rake litmus:acceptance:parallel
services: docker
sudo: required
stage: acceptance
simplecov: true
notifications:
slack:
secure: >-
bkgukmfDEw0pA7mx0e8UU4p4GmpWL/s7kC5D/3XyqNilYI5SArkAt5MTnwMn7/GSF0JRspcrt3J9Y69lNseE5dDegArlht6D2c5Ad8o0ibrCN7yuz6XVyiODyYf32+w/lzsaTQJ1E/55HgTKJ9Tzk8sPlLsYcSEt2OGm+hR/2AoaLi6M8WSc5fCmTUI7AgLnT95jbDu5ioJkOILGCet47A24MXKR2jNaQ7KYhiQ8xqXPZ3Zp0N/bZuYjDiYEeRbjHWvALyInQVqCytv9aLW5v7tg4IjhkyYrDf4g5XamU2909uyTgHT+M/nuPsScnyEu5YdSWT9RqoAHhADz+7daFcgVtUIN5K8EEaNmA8b/nXrGnSh2S1MJ/D/lbo176oHiKh/KME0/L7+YfCxnyGMaraUcxVjj9FQzBDRDIiyDqJOVe4v0cpkdEuCgJTgaIJ2NLHVmJzgGYTuIp/xV2/zWEgqNxz977ydsPObU0T0MCqpzaFR7a5zj3hsNlGa25bbehDGUyi7MFi6TVQMRYhldiZXydERCFaBbKfOT5xfNNpu3FZmi7t1Tu2sClZFwKW9OachoDI/NFam6+D/Q2nuuAl+p/L5edeF3ciGTjMr9OGZeLqFS/6fUxfM/GP/3bDBzF8RN6gZW5HQdtJkXq5GbpifKsA9gEL4VbPKqNhEtDss=
appveyor.yml:
unmanaged: true

simplecov: true
Gemfile:
optional:
':development':
- gem: 'github_changelog_generator'
git: 'https://github.com/skywinder/github-changelog-generator'
ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018'
condition: "Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')"

":development":
- gem: github_changelog_generator
git: https://github.com/skywinder/github-changelog-generator
ref: 20ee04ba1234e9e83eb2ffb5056e23d641c7a018
condition: Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
spec/spec_helper.rb:
mock_with: ':rspec'
mock_with: ":rspec"
coverage_report: true
23 changes: 6 additions & 17 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,20 @@ cache: bundler
before_install:
- bundle -v
- rm -f Gemfile.lock
- gem update --system $RUBYGEMS_VERSION
- "# Update system gems if requested. This is useful to temporarily workaround troubles in the test runner"
- "# See https://github.com/puppetlabs/pdk-templates/commit/705154d5c437796b821691b707156e1b056d244f for an example of how this was used"
- '[ -z "$RUBYGEMS_VERSION" ] || gem update --system $RUBYGEMS_VERSION'
- gem --version
- bundle -v
script:
- 'bundle exec rake $CHECK'
- 'SIMPLECOV=yes bundle exec rake $CHECK'
bundler_args: --without system_tests
rvm:
- 2.5.3
stages:
- static
- spec
- acceptance
-
if: tag =~ ^v\d
name: deploy
matrix:
fast_finish: true
include:
Expand All @@ -34,9 +33,6 @@ matrix:
env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
rvm: 2.5.3
stage: spec
-
env: DEPLOY_TO_FORGE=yes
stage: deploy
-
before_script: ["bundle exec rake 'litmus:provision_list[travis_deb]'", "bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"]
bundler_args:
Expand Down Expand Up @@ -104,12 +100,5 @@ branches:
- release
notifications:
email: false
deploy:
provider: puppetforge
user: puppet
password:
secure: ""
on:
tags: true
all_branches: true
condition: "$DEPLOY_TO_FORGE = yes"
slack:
secure: bkgukmfDEw0pA7mx0e8UU4p4GmpWL/s7kC5D/3XyqNilYI5SArkAt5MTnwMn7/GSF0JRspcrt3J9Y69lNseE5dDegArlht6D2c5Ad8o0ibrCN7yuz6XVyiODyYf32+w/lzsaTQJ1E/55HgTKJ9Tzk8sPlLsYcSEt2OGm+hR/2AoaLi6M8WSc5fCmTUI7AgLnT95jbDu5ioJkOILGCet47A24MXKR2jNaQ7KYhiQ8xqXPZ3Zp0N/bZuYjDiYEeRbjHWvALyInQVqCytv9aLW5v7tg4IjhkyYrDf4g5XamU2909uyTgHT+M/nuPsScnyEu5YdSWT9RqoAHhADz+7daFcgVtUIN5K8EEaNmA8b/nXrGnSh2S1MJ/D/lbo176oHiKh/KME0/L7+YfCxnyGMaraUcxVjj9FQzBDRDIiyDqJOVe4v0cpkdEuCgJTgaIJ2NLHVmJzgGYTuIp/xV2/zWEgqNxz977ydsPObU0T0MCqpzaFR7a5zj3hsNlGa25bbehDGUyi7MFi6TVQMRYhldiZXydERCFaBbKfOT5xfNNpu3FZmi7t1Tu2sClZFwKW9OachoDI/NFam6+D/Q2nuuAl+p/L5edeF3ciGTjMr9OGZeLqFS/6fUxfM/GP/3bDBzF8RN6gZW5HQdtJkXq5GbpifKsA9gEL4VbPKqNhEtDss=
17 changes: 13 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,18 @@

All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).

## [v0.6.0](https://github.com/puppetlabs/puppetlabs-facter_task/tree/v0.6.0) (2019-11-11)
## [v0.7.0](https://github.com/puppetlabs/puppetlabs-facter_task/tree/v0.7.0) (2020-01-03)

[Full Changelog](https://github.com/puppetlabs/puppetlabs-facter_task/compare/v0.5.0...v0.6.0)
[Full Changelog](https://github.com/puppetlabs/puppetlabs-facter_task/compare/v0.6.0...v0.7.0)

### Changed
### Added

- pdksync - FM-8499 - remove ubuntu14 support [\#93](https://github.com/puppetlabs/puppetlabs-facter_task/pull/93) ([lionce](https://github.com/lionce))
- pdksync - "MODULES-10242 Add ubuntu14 support back to the modules" [\#101](https://github.com/puppetlabs/puppetlabs-facter_task/pull/101) ([sheenaajay](https://github.com/sheenaajay))
- \(FM-8688\) - Addition of support for CentOS 8 [\#97](https://github.com/puppetlabs/puppetlabs-facter_task/pull/97) ([david22swan](https://github.com/david22swan))

## [v0.6.0](https://github.com/puppetlabs/puppetlabs-facter_task/tree/v0.6.0) (2019-11-11)

[Full Changelog](https://github.com/puppetlabs/puppetlabs-facter_task/compare/v0.5.0...v0.6.0)

## [v0.5.0](https://github.com/puppetlabs/puppetlabs-facter_task/tree/v0.5.0) (2019-09-05)

Expand Down Expand Up @@ -37,6 +42,10 @@ All notable changes to this project will be documented in this file. The format

[Full Changelog](https://github.com/puppetlabs/puppetlabs-facter_task/compare/0.3.1...0.4.0)

### Changed

- pdksync - FM-8499 - remove ubuntu14 support [\#93](https://github.com/puppetlabs/puppetlabs-facter_task/pull/93) ([lionce](https://github.com/lionce))

### Added

- pdksync - \(FM-7392\) - Puppet 6 Testing Changes [\#49](https://github.com/puppetlabs/puppetlabs-facter_task/pull/49) ([pmcmaw](https://github.com/pmcmaw))
Expand Down
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
source ENV['GEM_SOURCE'] || 'https://rubygems.org'
gem 'pdk', git: 'https://github.com/puppetlabs/pdk.git', branch: 'master'

def location_for(place_or_version, fake_version = nil)
git_url_regex = %r{\A(?<url>(https?|git)[:@][^#]*)(#(?<branch>.*))?}
Expand Down
6 changes: 0 additions & 6 deletions MAINTAINERS.md

This file was deleted.

Loading