Skip to content

Commit

Permalink
(SIMP-8839) Remove EL6 from pupmod-simp-tcpwrappers (#47)
Browse files Browse the repository at this point in the history
This patch removes EL6 as a supported OS in `metadata.json`, Hiera YAML
files and from the beaker acceptance tests and nodesets.

SIMP-8911 #close
[SIMP-8839] #comment Removed EL6 from pupmod-simp-tcpwrappers
[SIMP-8489] #comment Updated pupmod-simp-tcpwrappers GLCI pipeline to Puppet 6.18
[SIMP-8923] #comment Renamed 'sanity' to 'releng' in pupmod-simp-tcpwrappers
  • Loading branch information
op-ct authored Dec 22, 2020
1 parent 731e909 commit e22e5bc
Show file tree
Hide file tree
Showing 9 changed files with 50 additions and 21 deletions.
6 changes: 6 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# ------------------------------------------------------------------------------
# NOTICE: **This file is maintained with puppetsync**
#
# This file is automatically updated as part of a puppet module baseline.
# The next baseline sync will overwrite any local changes made to this file.
# ------------------------------------------------------------------------------
*.erb eol=lf
*.pp eol=lf
*.sh eol=lf
Expand Down
8 changes: 6 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# NOTE: This file is managed by puppetsync. Make sure any changes are
# reflected in the control repo.
# ------------------------------------------------------------------------------
# NOTICE: **This file is maintained with puppetsync**
#
# This file is automatically updated as part of a puppet module baseline.
# The next baseline sync will overwrite any local changes made to this file.
# ------------------------------------------------------------------------------
.*.sw?
.yardoc
.idea/
Expand Down
30 changes: 18 additions & 12 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
# ------------------------------------------------------------------------------
# NOTICE: **This file is maintained with puppetsync**
#
# Everything above the "Repo-specific content" comment will be overwritten by
# the next puppetsync.
# This file is updated automatically as part of a puppet module baseline.
#
# The next baseline sync will overwrite any local changes to everything above
# the line "# Repo-specific content"
# ------------------------------------------------------------------------------
# The testing matrix considers ruby/puppet versions supported by SIMP and PE:
#
Expand All @@ -13,11 +15,10 @@
# Release Puppet Ruby EOL
# SIMP 6.4 5.5 2.4.10 TBD
# PE 2018.1 5.5 2.4.10 2021-01 (LTS overlap)
# PE 2019.8 6.16 2.5.7 2021-11 (LTS)
# PE 2019.8 6.18 2.5.7 2022-12 (LTS)
---

stages:
- 'sanity'
- 'validation'
- 'acceptance'
- 'compliance'
Expand Down Expand Up @@ -76,6 +77,9 @@ variables:
- "{manifests,files,types}/**/*"
- "templates/*.{erb,epp}"
- "lib/**/*"
- "Gemfile"
- "SIMP/**/*"
- "data/**/*"
exists:
- "spec/{classes,unit,defines,type_aliases,types,hosts}/**/*_spec.rb"

Expand All @@ -87,6 +91,9 @@ variables:
- "{manifests,files,types}/**/*"
- "templates/*.{erb,epp}"
- "lib/**/*"
- "Gemfile"
- "SIMP/**/*"
- "data/**/*"
exists:
- "spec/acceptance/**/*_spec.rb"

Expand Down Expand Up @@ -208,10 +215,10 @@ variables:
BEAKER_PUPPET_COLLECTION: 'puppet6'
MATRIX_RUBY_VERSION: '2.5'

.pup_6_16_0: &pup_6_16_0
.pup_6_18_0: &pup_6_18_0
image: 'ruby:2.5'
variables:
PUPPET_VERSION: '6.16.0'
PUPPET_VERSION: '6.18.0'
BEAKER_PUPPET_COLLECTION: 'puppet6'
MATRIX_RUBY_VERSION: '2.5'

Expand Down Expand Up @@ -251,14 +258,13 @@ variables:
# Pipeline / testing matrix
#=======================================================================

sanity_checks:
releng_checks:
<<: *pup_5
<<: *setup_bundler_env
stage: 'sanity'
stage: 'validation'
tags: ['docker']
script:
- 'if `hash apt-get`; then apt-get update; fi'
- 'if `hash apt-get`; then apt-get install -y rpm; fi'
- 'command -v rpm || if command -v apt-get; then apt-get update; apt-get install -y rpm; fi ||:'
- 'bundle exec rake check:dot_underscore'
- 'bundle exec rake check:test_file'
- 'bundle exec rake pkg:check_version'
Expand Down Expand Up @@ -294,8 +300,8 @@ pup6-unit:
<<: *unit_tests
<<: *with_SIMP_SPEC_MATRIX_LEVEL_2

pup6.16.0-unit:
<<: *pup_6_16_0
pup6.18.0-unit:
<<: *pup_6_18_0
<<: *unit_tests

# ------------------------------------------------------------------------------
Expand Down
6 changes: 4 additions & 2 deletions .pmtignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
# .pmtignore is required to mask symlinks from the `puppet module build` test
# In the module's pipeline sanity checks
# ------------------------------------------------------------------------------
# NOTE: This file is managed by puppetsync. Make sure any changes are
# reflected in the control repo.
# NOTICE: **This file is maintained with puppetsync**
#
# This file is automatically updated as part of a puppet module baseline.
# The next baseline sync will overwrite any local changes made to this file.
# ------------------------------------------------------------------------------
.*.sw?
.yardoc
Expand Down
6 changes: 6 additions & 0 deletions .puppet-lint.rc
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# ------------------------------------------------------------------------------
# NOTICE: **This file is maintained with puppetsync**
#
# This file is automatically updated as part of a puppet module baseline.
# The next baseline sync will overwrite any local changes made to this file.
# ------------------------------------------------------------------------------
--log-format="%{path}:%{line}:%{check}:%{KIND}:%{message}"
--relative
--no-class_inherits_from_params_class-check
Expand Down
1 change: 0 additions & 1 deletion .ruby-version

This file was deleted.

3 changes: 3 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
* Sat Dec 19 2020 Chris Tessmer <[email protected]> - 6.2.1
- Removed EL6 support

* Tue Oct 08 2019 Robert Vincent <[email protected]> - 6.2.0-0
- Drop Puppet 4 support
- Add Puppet 6 support
Expand Down
6 changes: 6 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# ------------------------------------------------------------------------------
# NOTICE: **This file is maintained with puppetsync**
#
# This file is automatically updated as part of a puppet module baseline.
# The next baseline sync will overwrite any local changes made to this file.
# ------------------------------------------------------------------------------
gem_sources = ENV.fetch('GEM_SERVERS','https://rubygems.org').split(/[, ]+/)

ENV['PDK_DISABLE_ANALYTICS'] ||= 'true'
Expand Down
5 changes: 1 addition & 4 deletions metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "simp-tcpwrappers",
"version": "6.2.0",
"version": "6.2.1",
"author": "SIMP Team",
"summary": "manages /etc/hosts.allow (/etc/hosts.deny is ALL:ALL by default)",
"license": "Apache-2.0",
Expand Down Expand Up @@ -35,21 +35,18 @@
{
"operatingsystem": "CentOS",
"operatingsystemrelease": [
"6",
"7"
]
},
{
"operatingsystem": "RedHat",
"operatingsystemrelease": [
"6",
"7"
]
},
{
"operatingsystem": "OracleLinux",
"operatingsystemrelease": [
"6",
"7"
]
}
Expand Down

0 comments on commit e22e5bc

Please sign in to comment.