From dda2a3dff4164ff50fbe8dfc3903d8851b880d5f Mon Sep 17 00:00:00 2001 From: Trevor Vaughan Date: Thu, 19 Dec 2019 14:04:16 -0500 Subject: [PATCH] (SIMP-7297) Add EL8 support (#14) SIMP-7297 #close SIMP-7202 #comment Add EL8 support to simp-ima --- .gitignore | 8 +++++--- .gitlab-ci.yml | 26 +++++++++++++------------- CHANGELOG | 3 +++ Gemfile | 6 +++--- metadata.json | 18 ++++++++++++++---- spec/acceptance/nodesets/default.yml | 7 +++++-- spec/acceptance/nodesets/oel.yml | 8 ++++++-- 7 files changed, 49 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index 3ee72d0..7906a02 100644 --- a/.gitignore +++ b/.gitignore @@ -2,10 +2,11 @@ .yardoc dist/ pkg/ -spec/fixtures/ +spec/fixtures/* +!spec/fixtures/hieradata/ +!spec/fixtures/hieradata/* +spec/fixtures/hieradata/hiera.yaml spec/rp_env/ -!/spec/hieradata/default.yaml -!/spec/fixtures/site.pp .rspec_system .vagrant/ .bundle/ @@ -14,3 +15,4 @@ vendor/ junit/ log/ doc/ +.idea/ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 09249a9..60813af 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ # 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*** +# SIMP 6.3 5.5.16 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^^^ # @@ -69,10 +69,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' @@ -149,8 +149,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: @@ -159,26 +159,26 @@ pup6-unit: # Acceptance tests # ============================================================================== -pup5.5.10: - <<: *pup_5_5_10 +pup5.5.16: + <<: *pup_5_5_16 <<: *acceptance_base script: - 'bundle exec rake beaker:suites' -pup5.5.10-fips: - <<: *pup_5_5_10 +pup5.5.16-fips: + <<: *pup_5_5_16 <<: *acceptance_base script: - 'BEAKER_fips=yes bundle exec rake beaker:suites' -pup5.5.10-oel: - <<: *pup_5_5_10 +pup5.5.16-oel: + <<: *pup_5_5_16 <<: *acceptance_base script: - 'bundle exec rake beaker:suites[default,oel]' -pup5.5.10-oel-fips: - <<: *pup_5_5_10 +pup5.5.16-oel-fips: + <<: *pup_5_5_16 <<: *acceptance_base <<: *only_with_SIMP_FULL_MATRIX script: diff --git a/CHANGELOG b/CHANGELOG index eb779be..33fd464 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +* Mon Dec 16 2019 Trevor Vaughan - 0.3.0-0 +- Add EL8 support + * Tue Jul 16 2019 Robert Vincent - 0.2.0-0 - Provide Puppet-6 compatibility. - Facter.value(:cmdline) is not always set. diff --git a/Gemfile b/Gemfile index 43226f2..b466a99 100644 --- a/Gemfile +++ b/Gemfile @@ -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.2') - gem 'simp-rake-helpers', ENV.fetch('SIMP_RAKE_HELPERS_VERSION', '~> 5.6') + 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']) end group :development do @@ -25,5 +25,5 @@ end group :system_tests do gem 'beaker' gem 'beaker-rspec' - gem 'simp-beaker-helpers', ENV.fetch('SIMP_BEAKER_HELPERS_VERSION', '~> 1.12') + gem 'simp-beaker-helpers', ENV.fetch('SIMP_BEAKER_HELPERS_VERSION', ['>= 1.17.0', '< 2.0.0']) end diff --git a/metadata.json b/metadata.json index 5186139..5e85ef7 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "simp-ima", - "version": "0.2.0", + "version": "0.3.0", "author": "SIMP Team", "summary": "Manages IMA", "license": "Apache-2.0", @@ -18,7 +18,7 @@ }, { "name": "simp/simplib", - "version_requirement": ">= 3.1.0 < 4.0.0" + "version_requirement": ">= 3.1.0 < 5.0.0" }, { "name": "puppetlabs/stdlib", @@ -30,14 +30,24 @@ "operatingsystem": "CentOS", "operatingsystemrelease": [ "6", - "7" + "7", + "8" ] }, { "operatingsystem": "RedHat", "operatingsystemrelease": [ "6", - "7" + "7", + "8" + ] + }, + { + "operatingsystem": "OracleLinux", + "operatingsystemrelease": [ + "6", + "7", + "8" ] } ], diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml index 0b7b8fb..5310f21 100644 --- a/spec/acceptance/nodesets/default.yml +++ b/spec/acceptance/nodesets/default.yml @@ -15,12 +15,15 @@ HOSTS: hypervisor: <%= hypervisor %> el6: - roles: - - server platform: el-6-x86_64 box: centos/6 hypervisor: <%= hypervisor %> + el8: + platform: el-8-x86_64 + box: centos/8 + hypervisor: <%= hypervisor %> + CONFIG: log_level: verbose type: aio diff --git a/spec/acceptance/nodesets/oel.yml b/spec/acceptance/nodesets/oel.yml index c7eb2af..d3b7c42 100644 --- a/spec/acceptance/nodesets/oel.yml +++ b/spec/acceptance/nodesets/oel.yml @@ -13,13 +13,17 @@ HOSTS: platform: el-7-x86_64 box: onyxpoint/oel-7-x86_64 hypervisor: <%= hypervisor %> + el6: - roles: - - server platform: el-6-x86_64 box: onyxpoint/oel-6-x86_64 hypervisor: <%= hypervisor %> + el8: + platform: el-8-x86_64 + box: generic/oracle8 + hypervisor: <%= hypervisor %> + CONFIG: log_level: verbose type: aio