Skip to content

Commit

Permalink
(SIMP-2791) Drop support for Hiera 4 (#10)
Browse files Browse the repository at this point in the history
SIMP-2791 #comment pupmod-simp-chkrootkit
  • Loading branch information
lnemsick-simp authored and trevor-vaughan committed Sep 7, 2018
1 parent 921b27b commit fab05d9
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 72 deletions.
53 changes: 0 additions & 53 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
# https://puppet.com/docs/pe/2017.3/overview/getting_support_for_pe.html#standard-releases-and-long-term-support-releases
# ------------------------------------------------------------------------------
# release pup ruby eol
# PE 2016.4 4.7 2.1.9 2018-10 (LTS)
# SIMP6.0.0 4.8 2.1.9 TBD
# PE 2017.2 4.10 2.1.9 2018-02-21
# PE 2017.3 5.3 2.4.1 2018-07
# PE 2018.1 ??? ????? ????-?? (LTS)
Expand Down Expand Up @@ -54,57 +52,6 @@ stages:
- acceptance
- deploy

# Puppet 4.7 for PE 2016.4 LTS Support (EOL: 2018-10-21)
# See: https://puppet.com/misc/puppet-enterprise-lifecycle
# --------------------------------------
pup4_7-validation:
stage: validation
tags:
- docker
image: ruby:2.1
variables:
PUPPET_VERSION: '~> 4.7.0'
<<: *cache_bundler
<<: *setup_bundler_env
<<: *validation_checks

pup4_7-unit:
stage: unit
tags:
- docker
image: ruby:2.1
variables:
PUPPET_VERSION: '~> 4.7.0'
<<: *cache_bundler
<<: *setup_bundler_env
<<: *spec_tests


# Puppet 4.8 for SIMP 6.0 + 6.1 support
# --------------------------------------
pup4_8-validation:
stage: validation
tags:
- docker
image: ruby:2.1
variables:
PUPPET_VERSION: '~> 4.8.0'
<<: *cache_bundler
<<: *setup_bundler_env
<<: *validation_checks

pup4_8-unit:
stage: unit
tags:
- docker
image: ruby:2.1
variables:
PUPPET_VERSION: '~> 4.8.0'
<<: *cache_bundler
<<: *setup_bundler_env
<<: *spec_tests


# Puppet 4.10 for PE 2017.2 support (EOL:2018-02-21)
# See: https://puppet.com/misc/puppet-enterprise-lifecycle
# --------------------------------------
Expand Down
16 changes: 0 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
# The testing matrix considers ruby/puppet versions supported by SIMP and PE:
# ------------------------------------------------------------------------------
# release pup ruby eol
# PE 2016.4 4.7 2.1.9 TBD (LTS)
# PE 2016.5 4.8 2.1.9 2017-10-31
# SIMP6.0.0 4.8 2.1.9 TBD
# PE 2017.1 4.9 2.1.9 2017-10-31
# PE 2017.2 4.10 2.1.9 TBD
---
language: ruby
Expand Down Expand Up @@ -51,18 +47,6 @@ jobs:
script:
- bundle exec rake spec

- stage: spec
rvm: 2.1.9
env: STRICT_VARIABLES=yes TRUSTED_NODE_DATA=yes PUPPET_VERSION="~> 4.9.2"
script:
- bundle exec rake spec

- stage: spec
rvm: 2.1.9
env: STRICT_VARIABLES=yes TRUSTED_NODE_DATA=yes PUPPET_VERSION="~> 4.7.0"
script:
- bundle exec rake spec

- stage: deploy
rvm: 2.4.1
script:
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
* Fri Sep 07 2018 Liz Nemsick <[email protected]> - 0.0.3-0
- Drop Hiera 4 support

* Sat Mar 17 2018 Trevor Vaughan <[email protected]> - 0.0.3-0
- Added OEL and Puppet 5 support

Expand Down
5 changes: 2 additions & 3 deletions metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@
"requirements": [
{
"name": "puppet",
"version_requirement": ">= 4.7.0 < 6.0.0"
"version_requirement": ">= 4.10.4 < 6.0.0"
}
],
"data_provider": "hiera"
]
}

0 comments on commit fab05d9

Please sign in to comment.