Skip to content

Commit

Permalink
(SIMP-7318) Add EL8 Support (#213)
Browse files Browse the repository at this point in the history
* (SIMP-7318) Add EL8 Support

SIMP-7318 #close
SIMP-7202 #comment Add EL8 support to simp-simplib

* Update Puppet version to 5.5.16 in gitlab-ci. Update Gemfile versions.

* remove ntpdate from el8 docker nodeset

* allow failure for caller function in pup6 test

Co-authored-by: jeannegreulich <jeanne.greulich@onyxpoint.com>
  • Loading branch information
trevor-vaughan and jeannegreulich committed Jan 9, 2020
1 parent a0e9025 commit c224236
Show file tree
Hide file tree
Showing 12 changed files with 99 additions and 67 deletions.
46 changes: 24 additions & 22 deletions .gitlab-ci.yml
Expand Up @@ -5,8 +5,8 @@
# https://puppet.com/docs/pe/2018.1/overview/getting_support_for_pe.html
# ------------------------------------------------------------------------------
# Release Puppet Ruby EOL
# SIMP 6.3 5.5.10 2.4.5 TBD***
# PE 2018.1 5.5.8 2.4.5 2020-05 (LTS)***
# SIMP 6.3 5.5.16 2.4.5 TBD***
# PE 2018.1 5.5.16 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 @@ -70,10 +70,10 @@ variables:
BEAKER_PUPPET_COLLECTION: 'puppet5'
MATRIX_RUBY_VERSION: '2.4'

.pup_5_5_10: &pup_5_5_10
.pup_5_5_16: &pup_5_5_16
image: 'ruby:2.4'
variables:
PUPPET_VERSION: '5.5.10'
PUPPET_VERSION: '5.5.16'
BEAKER_PUPPET_COLLECTION: 'puppet5'
MATRIX_RUBY_VERSION: '2.4'

Expand Down Expand Up @@ -151,8 +151,8 @@ pup5-unit:
<<: *pup_5
<<: *unit_tests

pup5.5.10-unit:
<<: *pup_5_5_10
pup5.5.16-unit:
<<: *pup_5_5_16
<<: *unit_tests

pup6-unit:
Expand All @@ -161,52 +161,52 @@ pup6-unit:

# Acceptance tests
# ==============================================================================
pup5.5.10:
pup5.5.16:
<<: *acceptance_base
<<: *pup_5_5_10
<<: *pup_5_5_16
script:
- 'bundle exec rake beaker:suites[default,default]'

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

pup5.5.10-prelink_fact:
pup5.5.16-prelink_fact:
<<: *acceptance_base
<<: *pup_5_5_10
<<: *pup_5_5_16
script:
- 'bundle exec rake beaker:suites[prelink_fact,default]'

pup5.5.10-ipa_fact:
pup5.5.16-ipa_fact:
<<: *acceptance_base
<<: *pup_5_5_10
<<: *pup_5_5_16
script:
- 'bundle exec rake beaker:suites[ipa_fact,default]'

pup5.5.10-caller_function:
pup5.5.16-caller_function:
<<: *acceptance_base
<<: *pup_5_5_10
<<: *pup_5_5_16
script:
- 'bundle exec rake beaker:suites[caller_function,default]'

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

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

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

Expand All @@ -229,8 +229,10 @@ pup6-ipa_fact:
script:
- 'bundle exec rake beaker:suites[ipa_fact,default]'

# simplib::caller function is failing in puppet 6. jira SIMP-7471
pup6-caller_function:
<<: *acceptance_base
<<: *pup_6
allow_failure: true
script:
- 'bundle exec rake beaker:suites[caller_function,default]'
3 changes: 3 additions & 0 deletions CHANGELOG
@@ -1,3 +1,6 @@
* Fri Dec 20 2019 Trevor Vaughan <tvaughan@onyxpoint.com> - 4.1.0-0
- Add EL8 support

* Wed Dec 04 2019 Trevor Vaughan <tvaughan@onyxpoint.com> - 4.0.1-0
- Fixed an issue in `simplib::ip::family_hash` where the 'unknown' entries were
not properly populated.
Expand Down
6 changes: 3 additions & 3 deletions Gemfile
Expand Up @@ -13,8 +13,8 @@ group :test do
gem 'puppet-strings'
gem 'puppet-lint-empty_string-check', :require => false
gem 'puppet-lint-trailing_comma-check', :require => false
gem 'simp-rspec-puppet-facts', ENV.fetch('SIMP_RSPEC_PUPPET_FACTS_VERSION', '~> 2.3')
gem 'simp-rake-helpers', ENV.fetch('SIMP_RAKE_HELPERS_VERSION', ['>= 5.8', '< 6.0'])
gem 'simp-rspec-puppet-facts', ENV.fetch('SIMP_RSPEC_PUPPET_FACTS_VERSION', ['>= 2.4.0', '< 3.0.0'] )
gem 'simp-rake-helpers', ENV.fetch('SIMP_RAKE_HELPERS_VERSION', ['>= 5.9', '< 6.0'])
gem 'danger', :require => false
end

Expand All @@ -27,5 +27,5 @@ end
group :system_tests do
gem 'beaker'
gem 'beaker-rspec'
gem 'simp-beaker-helpers', ENV.fetch('SIMP_BEAKER_HELPERS_VERSION', '~> 1.13')
gem 'simp-beaker-helpers', ENV.fetch('SIMP_BEAKER_HELPERS_VERSION', ['>= 1.17.0', '< 2.0.0'])
end
18 changes: 4 additions & 14 deletions REFERENCE.md
Expand Up @@ -1610,16 +1610,11 @@ ipv6:
```

#### `simplib::ip::family_hash(Variant[
Simplib::IP,
Simplib::Host,
Simplib::IP::V4::DDQ,
Simplib::IP::V4::CIDR,
Simplib::IP::V6::CIDR,
Array[Variant[
Simplib::IP,
Simplib::IP::V4::DDQ,
Simplib::IP::V4::CIDR,
Simplib::IP::V6::CIDR
]]
Simplib::Netlist
] $ip_addresses)`

Process an array of IP addresses and return them split by IP family and
Expand Down Expand Up @@ -1682,16 +1677,11 @@ ipv6:
##### `ip_addresses`

Data type: `Variant[
Simplib::IP,
Simplib::Host,
Simplib::IP::V4::DDQ,
Simplib::IP::V4::CIDR,
Simplib::IP::V6::CIDR,
Array[Variant[
Simplib::IP,
Simplib::IP::V4::DDQ,
Simplib::IP::V4::CIDR,
Simplib::IP::V6::CIDR
]]
Simplib::Netlist
]`

The addresses to convert
Expand Down
17 changes: 11 additions & 6 deletions metadata.json
@@ -1,6 +1,6 @@
{
"name": "simp-simplib",
"version": "4.0.1",
"version": "4.1.0",
"author": "SIMP Team",
"summary": "A collection of common SIMP functions, facts, and types",
"license": "Apache-2.0",
Expand Down Expand Up @@ -38,14 +38,16 @@
"operatingsystem": "CentOS",
"operatingsystemrelease": [
"6",
"7"
"7",
"8"
]
},
{
"operatingsystem": "OracleLinux",
"operatingsystemrelease": [
"6",
"7"
"7",
"8"
]
},
{
Expand All @@ -68,15 +70,17 @@
"operatingsystemrelease": [
"8",
"9",
"10"
"10",
"11"
]
},
{
"operatingsystem": "Ubuntu",
"operatingsystemrelease": [
"14.04",
"16.04",
"18.04"
"18.04",
"19.04"
]
},
{
Expand Down Expand Up @@ -104,7 +108,8 @@
"operatingsystem": "AIX",
"operatingsystemrelease": [
"6.1",
"7.1"
"7.1",
"7.2"
]
}
],
Expand Down
9 changes: 9 additions & 0 deletions spec/acceptance/nodesets/default.yml
Expand Up @@ -11,17 +11,26 @@ HOSTS:
- default
- master
- client
- prelink
platform: el-6-x86_64
box: centos/6
hypervisor: <%= hypervisor %>

el7:
roles:
- client
- prelink
platform: el-7-x86_64
box: centos/7
hypervisor: <%= hypervisor %>

el8:
roles:
- client
platform: el-8-x86_64
box: centos/8
hypervisor: <%= hypervisor %>

CONFIG:
log_level: verbose
type: aio
Expand Down
14 changes: 13 additions & 1 deletion spec/acceptance/nodesets/docker.yml
Expand Up @@ -3,6 +3,7 @@ HOSTS:
roles:
- default
- server
- prelink
platform: el-7-x86_64
hypervisor: docker
image: centos:7
Expand All @@ -15,15 +16,26 @@ HOSTS:
el6-docker:
roles:
- server
- prelink
platform: el-6-x86_64
hypervisor: docker
image: centos:6
#docker_cmd: '/usr/sbin/init'
docker_preserve_image: true
docker_image_commands:
# Puppet Deps
- 'yum install -y ntpdate rsync openssl'

el8-docker:
roles:
- server
platform: el-8-x86_64
hypervisor: docker
image: centos:8
docker_preserve_image: true
docker_image_commands:
# Puppet Deps
- 'yum install -y rsync openssl'

CONFIG:
log_level: verbose
type: aio
11 changes: 10 additions & 1 deletion spec/acceptance/nodesets/oel.yml
Expand Up @@ -11,15 +11,24 @@ HOSTS:
- default
- master
- client
- prelink
platform: el-6-x86_64
box: onyxpoint/oel-6-x86_64
hypervisor: <%= hypervisor %>

oel7:
roles:
- client
- prelink
platform: el-7-x86_64
box: onyxpoint/oel-7-x86_64
box: generic/oracle7
hypervisor: <%= hypervisor %>

oel8:
roles:
- client
platform: el-8-x86_64
box: generic/oracle8
hypervisor: <%= hypervisor %>

CONFIG:
Expand Down
3 changes: 1 addition & 2 deletions spec/acceptance/nodesets/rhel7.yml
Expand Up @@ -10,8 +10,7 @@ HOSTS:
roles:
- server
- default
- master
- simp_server
- prelink
platform: el-7-x86_64
box: generic/rhel7
hypervisor: <%= hypervisor %>
Expand Down
1 change: 0 additions & 1 deletion spec/acceptance/nodesets/rhel8.yml
Expand Up @@ -11,7 +11,6 @@ HOSTS:
- server
- default
- master
- simp_server
platform: el-8-x86_64
box: generic/rhel8
hypervisor: <%= hypervisor %>
Expand Down
2 changes: 2 additions & 0 deletions spec/acceptance/suites/ipa_fact/ipa_fact_spec.rb
Expand Up @@ -74,6 +74,7 @@ def skip_fips(host)

context 'when IPA is installed, but host has not yet joined IPA domain' do
it 'ipa fact should be nil because /etc/ipa/default.conf does not exist' do
upgrade_package(server, 'nss')
install_package(server, 'ipa-server')
server.reboot # WORKAROUND: https://bugzilla.redhat.com/show_bug.cgi?id=1504688

Expand All @@ -94,6 +95,7 @@ def skip_fips(host)
fqdn = fact_on(server, 'fqdn')

cmd = [
'umask 0022 &&',
'ipa-server-install',
# IPA realm and domain do not have to match hostname
"--domain #{ipa_domain}",
Expand Down

0 comments on commit c224236

Please sign in to comment.