Amazon Linux 2 Support

Closes simp#84

.gitlab-ci.yml

@@ -368,6 +368,12 @@ pup6.pe-oel:
  script:
  - 'bundle exec rake beaker:suites[default,oel]'
 
+pup6.pe-amzn2:
+ <<: *pup_6_pe
+ <<: *acceptance_base
+ script:
+ - 'bundle exec rake beaker:suites[default,amzn2]'
+
 pup6.pe-oel-fips:
  <<: *pup_6_pe
  <<: *acceptance_base
@@ -394,6 +400,13 @@ pup7.x-oel:
  script:
  - 'bundle exec rake beaker:suites[default,oel]'
 
+pup7.x-amzn2:
+ <<: *pup_7_x
+ <<: *acceptance_base
+ <<: *with_SIMP_ACCEPTANCE_MATRIX_LEVEL_2
+ script:
+ - 'bundle exec rake beaker:suites[default,amzn2]'
+
 pup7.x-oel-fips:
  <<: *pup_7_x
  <<: *acceptance_base

CHANGELOG

@@ -1,3 +1,6 @@
+* Sat Sep 17 2022 Trevor Vaughan <trevor@sicura.us> - 6.7.0
+- Added support for Amazon Linux 2
+
 * Fri Jun 03 2022 Chris Tessmer <chris.tessmer@onyxpoint.com> - 6.6.0
 - Update from camptocamp/systemd to puppet/systemd
 

metadata.json

@@ -1,6 +1,6 @@
 {
  "name": "simp-aide",
- "version": "6.6.0",
+ "version": "6.7.0",
  "author": "SIMP Team",
  "summary": "manages AIDE",
  "license": "Apache-2.0",
@@ -46,6 +46,12 @@
  ]
  },
  "operatingsystem_support": [
+ {
+ "operatingsystem": "Amazon",
+ "operatingsystemrelease": [
+ "2"
+ ]
+ },
  {
  "operatingsystem": "CentOS",
  "operatingsystemrelease": [

spec/acceptance/nodesets/amzn2.yml

@@ -0,0 +1,23 @@
+<%
+ if ENV['BEAKER_HYPERVISOR']
+ hypervisor = ENV['BEAKER_HYPERVISOR']
+ else
+ hypervisor = 'vagrant'
+ end
+-%>
+HOSTS:
+ amzn2:
+ roles:
+ - default
+ platform: el-7-x86_64
+ box: gbailey/amzn2
+ hypervisor: <%= hypervisor %>
+
+CONFIG:
+ log_level: verbose
+ synced_folder : disabled
+ type: aio
+ vagrant_memsize: 512
+<% if ENV['BEAKER_PUPPET_COLLECTION'] -%>
+ puppet_collection: <%= ENV['BEAKER_PUPPET_COLLECTION'] %>
+<% end -%>

spec/spec_helper_acceptance.rb

@@ -32,7 +32,11 @@
  begin
  # Install modules and dependencies from spec/fixtures/modules
  copy_fixture_modules_to( hosts )
- server = only_host_with_role(hosts, 'server')
+ begin
+ server = only_host_with_role(hosts, 'server')
+ rescue ArgumentError =>e
+ server = only_host_with_role(hosts, 'default')
+ end
 
  # Generate and install PKI certificates on each SUT
  Dir.mktmpdir do |cert_dir|