Skip to content

Commit

Permalink
(SIMP-MAINT) Prep for release - remove Puppet 4 (#192)
Browse files Browse the repository at this point in the history 
* (SIMP-MAINT) Prep for release - remove Puppet 4

- Removed Puppet 4 support, as Puppet has removed the Puppet 4 RPMs from
  their yum repos.  This means all the Puppet 4 acceptance tests fail.
- Pinned the version of stdlib to 5.2.0 in the .fixtures.yml, as the
  version on master is beyond the upper bound allowed in this
  component's metadata.json.

* Address review comments
  • Loading branch information
@lnemsick-simp @jeannegreulich
lnemsick-simp authored and jeannegreulich committed Jun 11, 2019
1 parent 54d1d39 commit c568759
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 103 deletions.
4 changes: 3 additions & 1 deletion .fixtures.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
---
fixtures:
repositories:
stdlib: https://github.com/simp/puppetlabs-stdlib
stdlib:
repo: https://github.com/simp/puppetlabs-stdlib
ref: 5.2.0
# This needs to be in place for the rspec-puppet Hiera 5 hook to work
# No idea why, it may be because Puppet sees a custom backend and loads all
# of the global parts.
Expand Down
108 changes: 26 additions & 82 deletions .gitlab-ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@
# https://puppet.com/docs/pe/2018.1/overview/getting_support_for_pe.html
# ------------------------------------------------------------------------------
# Release Puppet Ruby EOL
# SIMP 6.1 4.10.6 2.1.9 TBD
# SIMP 6.2 4.10.12 2.1.9 TBD
# SIMP 6.3 5.5.7 2.4.4 TBD***
# PE 2018.1 5.5.8 2.4.4 2020-05 (LTS)***
# SIMP 6.3 5.5.10 2.4.5 TBD***
# PE 2018.1 5.5.8 2.4.5 2020-05 (LTS)***
# PE 2019.0 6.0 2.5.1 2019-08-31^^^
#
# *** = Modules created for SIMP 6.3+ are not required to support Puppet < 5.5
Expand Down Expand Up @@ -65,29 +63,17 @@ variables:
# Puppet Versions
#-----------------------------------------------------------------------

.pup_4: &pup_4
image: 'ruby:2.1'
variables:
PUPPET_VERSION: '~> 4.0'
MATRIX_RUBY_VERSION: '2.1'

.pup_4_10: &pup_4_10
image: 'ruby:2.1'
variables:
PUPPET_VERSION: '~> 4.10.4'
MATRIX_RUBY_VERSION: '2.1'

.pup_5: &pup_5
image: 'ruby:2.4'
variables:
PUPPET_VERSION: '~> 5.0'
BEAKER_PUPPET_COLLECTION: 'puppet5'
MATRIX_RUBY_VERSION: '2.4'

.pup_5_5_7: &pup_5_5_7
.pup_5_5_10: &pup_5_5_10
image: 'ruby:2.4'
variables:
PUPPET_VERSION: '5.5.7'
PUPPET_VERSION: '5.5.10'
BEAKER_PUPPET_COLLECTION: 'puppet5'
MATRIX_RUBY_VERSION: '2.4'

Expand Down Expand Up @@ -151,10 +137,6 @@ sanity_checks:
# Linting
#-----------------------------------------------------------------------

pup4-lint:
<<: *pup_4
<<: *lint_tests

pup5-lint:
<<: *pup_5
<<: *lint_tests
Expand All @@ -170,12 +152,8 @@ pup5-unit:
<<: *pup_5
<<: *unit_tests

pup5.5.7-unit:
<<: *pup_5_5_7
<<: *unit_tests

pup4.10-unit:
<<: *pup_4_10
pup5.5.10-unit:
<<: *pup_5_5_10
<<: *unit_tests

pup6-unit:
Expand All @@ -184,100 +162,66 @@ pup6-unit:

# Acceptance tests
# ==============================================================================

pup4.10:
<<: *acceptance_base
<<: *pup_4_10
script:
- 'bundle exec rake beaker:suites[default]'

pup4.10-fips:
<<: *acceptance_base
<<: *pup_4_10
<<: *only_with_SIMP_FULL_MATRIX
script:
- 'BEAKER_fips=yes bundle exec rake beaker:suites[default]'

pup4.10-prelink_fact:
<<: *acceptance_base
<<: *pup_4_10
script:
- 'BEAKER_fips=yes bundle exec rake beaker:suites[prelink_fact]'

pup4.10-prelink_fact-fips:
<<: *acceptance_base
<<: *pup_4_10
<<: *only_with_SIMP_FULL_MATRIX
script:
- 'BEAKER_fips=yes bundle exec rake beaker:suites[prelink_fact]'

pup4.10-ipa_fact:
<<: *acceptance_base
<<: *pup_4_10
<<: *only_with_SIMP_FULL_MATRIX
script:
- 'bundle exec rake beaker:suites[ipa_fact]'

pup5.5.7:
pup5.5.10:
<<: *acceptance_base
<<: *pup_5_5_7
<<: *pup_5_5_10
script:
- 'bundle exec rake beaker:suites[default]'

pup5.5.7-fips:
pup5.5.10-fips:
<<: *acceptance_base
<<: *pup_5_5_7
<<: *pup_5_5_10
script:
- 'BEAKER_fips=yes bundle exec rake beaker:suites[default]'

pup5.5.7-prelink_fact:
pup5.5.10-prelink_fact:
<<: *acceptance_base
<<: *pup_5_5_7
<<: *pup_5_5_10
script:
- 'bundle exec rake beaker:suites[prelink_fact]'

pup5.5.7-prelink_fact-fips:
pup5.5.10-prelink_fact-fips:
<<: *acceptance_base
<<: *pup_5_5_7
<<: *pup_5_5_10
script:
- 'BEAKER_fips=yes bundle exec rake beaker:suites[prelink_fact]'

pup5.5.7-ipa_fact:
pup5.5.10-ipa_fact:
<<: *acceptance_base
<<: *pup_5_5_7
<<: *pup_5_5_10
script:
- 'bundle exec rake beaker:suites[ipa_fact]'

pup5.5.7-oel:
pup5.5.10-oel:
<<: *acceptance_base
<<: *pup_5_5_7
<<: *pup_5_5_10
script:
- 'bundle exec rake beaker:suites[default,oel]'

pup5.5.7-oel-fips:
pup5.5.10-oel-fips:
<<: *acceptance_base
<<: *pup_5_5_7
<<: *pup_5_5_10
<<: *only_with_SIMP_FULL_MATRIX
script:
- 'BEAKER_fips=yes bundle exec rake beaker:suites[default,oel]'

pup5.5.7-oel-prelink_fact:
pup5.5.10-oel-prelink_fact:
<<: *acceptance_base
<<: *pup_5_5_7
<<: *pup_5_5_10
script:
- 'bundle exec rake beaker:suites[prelink_fact,oel]'

pup5.5.7-oel-prelink_fact-fips:
pup5.5.10-oel-prelink_fact-fips:
<<: *acceptance_base
<<: *pup_5_5_7
<<: *pup_5_5_10
<<: *only_with_SIMP_FULL_MATRIX
script:
- 'BEAKER_fips=yes bundle exec rake beaker:suites[prelink_fact,oel]'

# The default node set for the ipa_fact suite includes OEL servers
#pup5.5.7-oel-ipa_fact:
#pup5.5.10-oel-ipa_fact:
# <<: *acceptance_base
# <<: *pup_5_5_7
# <<: *pup_5_5_10
# <<: *only_with_SIMP_FULL_MATRIX
# script:
# - 'bundle exec rake beaker:suites[ipa_fact,oel]'
28 changes: 10 additions & 18 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,9 @@
# https://puppet.com/docs/pe/2018.1/overview/getting_support_for_pe.html
# ------------------------------------------------------------------------------
# Release Puppet Ruby EOL
# SIMP 6.2 4.10 2.1.9 TBD
# PE 2016.4 4.10 2.1.9 2018-12-31 (LTS)
# PE 2017.3 5.3 2.4.4 2018-12-31
# SIMP 6.3 5.5 2.4.4 TBD***
# PE 2018.1 5.5 2.4.4 2020-05 (LTS)***
# PE 2017.3 5.3 2.4.5 2018-12-31
# SIMP 6.3 5.5 2.4.5 TBD***
# PE 2018.1 5.5 2.4.5 2020-05 (LTS)***
# PE 2019.0 6.0 2.5.1 2019-08-31^^^
#
# *** = Modules created for SIMP 6.3+ are not required to support Puppet < 5.5
Expand Down Expand Up @@ -38,7 +36,8 @@ addons:

before_install:
- rm -f Gemfile.lock
- gem install -v '~> 1.16' bundler
- for x in ${HOME}/.rvm/gems/*; do gem uninstall --force -I -x -i "${x}" -v '>= 1.17' bundler || true; gem uninstall --force -I -x -i "${x}@global" -v '>= 1.17' bundler || true; done
- gem install -v '~> 1.17' bundler

global:
- STRICT_VARIABLES=yes
Expand All @@ -50,7 +49,7 @@ jobs:
include:
- stage: check
name: 'Syntax, style, and validation checks'
rvm: 2.4.4
rvm: 2.4.5
env: PUPPET_VERSION="~> 5"
script:
- bundle exec rake check:dot_underscore
Expand All @@ -62,30 +61,23 @@ jobs:
- bundle exec rake lint
- bundle exec puppet module build

- stage: spec
name: 'Puppet 4.10 (SIMP 6.2, PE 2016.4)'
rvm: 2.1.9
env: PUPPET_VERSION="~> 4.10.0"
script:
- bundle exec rake spec

- stage: spec
name: 'Puppet 5.3 (PE 2017.3)'
rvm: 2.4.4
rvm: 2.4.5
env: PUPPET_VERSION="~> 5.3.0"
script:
- bundle exec rake spec

- stage: spec
rvm: 2.4.4
rvm: 2.4.5
name: 'Puppet 5.5 (SIMP 6.3, PE 2018.1)'
env: PUPPET_VERSION="~> 5.5.0"
script:
- bundle exec rake spec

- stage: spec
name: 'Latest Puppet 5.x'
rvm: 2.4.4
rvm: 2.4.5
env: PUPPET_VERSION="~> 5.0"
script:
- bundle exec rake spec
Expand All @@ -98,7 +90,7 @@ jobs:
- bundle exec rake spec

- stage: deploy
rvm: 2.4.4
rvm: 2.4.5
script:
- true
before_deploy:
Expand Down
6 changes: 5 additions & 1 deletion CHANGELOG
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
* Fri May 31 2019 Liz Nemsick <lnemsick.simp@gmail.com> - 3.15.2-0
- Remove Puppet 4 support, as Puppet has removed the Puppet 4 RPMs from
their yum repos.

* Tue May 21 2019 Trevor Vaughan <tvaughan@onyxpoint.com> - 3.15.2-0
- Defer to the inbuilt 'fips_enabled' fact if it exists.

* Thu May 09 2019 Jeanne Greulich <jeanne.greulich@onyxpoint.com> - 3.15.1-0
- Updated simp_version function to use Puppet::Util::Execution.execute
instead of backtics. This avioids a GLIBC error triggered by JRuby 9K when
instead of backtics. This avoids a GLIBC error triggered by JRuby 9K when
backtics, system or %x are used.

* Fri Apr 12 2019 Michael Morrone <michael.morrone@onyxpoint.com> - 3.15.0-0
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
"requirements": [
{
"name": "puppet",
"version_requirement": ">= 4.10.4 < 6.0.0"
"version_requirement": ">= 5.0.0 < 6.0.0"
}
],
"package_release_version": "0"
Expand Down

0 comments on commit c568759

Please sign in to comment.