From f4ab2158fcc38fca7acd8d119d2533461a00ef23 Mon Sep 17 00:00:00 2001 From: op-ct Date: Wed, 9 Dec 2020 16:08:28 -0500 Subject: [PATCH] (SIMP-8827) Update simp-doc version, GLCI jobs (#712) * (SIMP-8827) Update simp-doc to 6.5.0-3 simp-doc 6.5.0-3 includes the announcement of the EOL & immediate deprecation of of EL6. [SIMP-8827] #close #comment Update simp-doc to 6.5.0-3 [SIMP-8828] #close #comment Remove EL6 tests from GitLab CI pipeline [SIMP-8829] #close #comment Copy validate/metadata checks to GitLab CI * (SIMP-8830) Remove EL6 from acceptance tests [SIMP-8830] #close --- .gitlab-ci.yml | 142 +++++------------- Puppetfile.pinned | 2 +- .../helpers/expect_script_helper.rb | 11 +- spec/acceptance/helpers/repo_helper.rb | 10 +- spec/acceptance/nodesets/default.yml | 19 --- spec/acceptance/nodesets/el6_server.yml | 75 --------- spec/acceptance/nodesets/el7_server.yml | 19 --- .../shared_examples/simp_server_bootstrap.rb | 18 --- spec/acceptance/suites/README.md | 38 ++--- .../suites/ipa/10_ipa_server_spec.rb | 4 - spec/acceptance/suites/ipa/30_ipa_spec.rb | 3 +- .../suites/ipa/nodesets/el6_server.yml | 103 ------------- .../suites/ipa/nodesets/el7_server.yml | 21 --- .../suites/rpm_docker/nodesets/el6.yml | 19 --- 14 files changed, 66 insertions(+), 418 deletions(-) delete mode 100644 spec/acceptance/nodesets/el6_server.yml delete mode 100644 spec/acceptance/suites/ipa/nodesets/el6_server.yml delete mode 100644 spec/acceptance/suites/rpm_docker/nodesets/el6.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 40c5a3fcd..db4aa8852 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,10 @@ --- +stages: + - 'validation' + - 'integration' + +image: 'ruby:2.5' + .cache_bundler: &cache_bundler cache: untracked: true @@ -20,10 +26,15 @@ - 'rm -rf pkg/ || :' - bundle check || rm -f Gemfile.lock && ("${BUNDLER_INSTALL[@]}" --local || "${BUNDLER_INSTALL[@]}") -stages: - - integration +.pup_6_18_0: &pup_6_18_0 + variables: + PUPPET_VERSION: '6.18.0' + BEAKER_PUPPET_COLLECTION: 'puppet6' -image: 'ruby:2.5' +.pup_6_18_0__oracle: &pup_6_18_0__oracle + variables: + PUPPET_VERSION: '6.18.0' + BEAKER_PUPPET_COLLECTION: 'puppet6' # Anchor to disable release flavored tests, and run them only when # the environment variable SIMP_RELEASE_TESTS is set in the GitLab repo settings @@ -45,31 +56,32 @@ image: 'ruby:2.5' - $SIMP_FULL_MATRIX - $SIMP_IPA_TEST -default_el6-puppet6: - stage: integration +# Pipeline / testing matrix +# ============================================================================= + +releng_checks: + stage: 'validation' image: 'ruby:2.5' - tags: - - beaker - <<: *cache_bundler + tags: ['docker'] + <<: *pup_6_18_0 <<: *setup_bundler_env - variables: - PUPPET_VERSION: '~> 6.18' - BEAKER_PUPPET_COLLECTION: 'puppet6' script: - - bundle exec rake spec_clean - - bundle exec rake beaker:suites[default,el6_server] - retry: 1 + - 'command -v rpm || if command -v apt-get; then apt-get update; apt-get install -y rpm; fi ||:' + - 'SIMP_RPM_dist=.el7 bundle exec rake check:dot_underscore' + - 'SIMP_RPM_dist=.el7 bundle exec rake check:test_file' + - 'SIMP_RPM_dist=.el7 bundle exec rake metadata_lint' + - 'bundle exec rake check:pkglist_lint' + +# Acceptance tests +# ============================================================================== default_el7-puppet6: stage: integration - image: 'ruby:2.5' tags: - beaker <<: *cache_bundler <<: *setup_bundler_env - variables: - PUPPET_VERSION: '~> 6.18' - BEAKER_PUPPET_COLLECTION: 'puppet6' + <<: *pup_6_18_0 script: - bundle exec rake spec_clean - bundle exec rake beaker:suites[default,el7_server] @@ -78,66 +90,25 @@ default_el7-puppet6: ipa_el7-puppet6: stage: integration - image: 'ruby:2.5' tags: - beaker <<: *cache_bundler <<: *setup_bundler_env <<: *only_with_SIMP_FULL_MATRIX_or_SIMP_IPA_TEST - variables: - PUPPET_VERSION: '~> 6.18' - BEAKER_PUPPET_COLLECTION: 'puppet6' + <<: *pup_6_18_0 script: - bundle exec rake spec_clean - bundle exec rake beaker:suites[ipa,el7_server] retry: 1 -# # IPA server has issues on el6 -# ipa_el6-puppet6: -# stage: integration -# image: 'ruby:2.5' -# tags: -# - beaker -# <<: *cache_bundler -# <<: *setup_bundler_env -# <<: *only_with_SIMP_FULL_MATRIX_or_SIMP_IPA_TEST -# variables: -# PUPPET_VERSION: '~> 6.18' -# BEAKER_PUPPET_COLLECTION: 'puppet6' -# script: -# - bundle exec rake beaker:suites[ipa,el6_server] -# retry: 1 - - -default_oel6-puppet6: - stage: integration - image: 'ruby:2.5' - tags: - - beaker - <<: *cache_bundler - <<: *setup_bundler_env - <<: *only_with_SIMP_FULL_MATRIX - variables: - PUPPET_VERSION: '~> 6.18' - BEAKER_PUPPET_COLLECTION: 'puppet6' - SIMP_BEAKER_OS: 'oracle' - script: - - bundle exec rake spec_clean - - bundle exec rake beaker:suites[default,el6_server] - retry: 1 - default_oel7-puppet6: stage: integration - image: 'ruby:2.5' tags: - beaker <<: *cache_bundler <<: *setup_bundler_env <<: *only_with_SIMP_FULL_MATRIX - variables: - PUPPET_VERSION: '~> 6.18' - BEAKER_PUPPET_COLLECTION: 'puppet6' - SIMP_BEAKER_OS: 'oracle' + <<: *pup_6_18_0__oracle script: - bundle exec rake spec_clean - bundle exec rake beaker:suites[default,el7_server] @@ -145,81 +116,38 @@ default_oel7-puppet6: ipa_oel7-puppet6: stage: integration - image: 'ruby:2.5' tags: - beaker <<: *cache_bundler <<: *setup_bundler_env <<: *only_with_SIMP_FULL_MATRIX_or_SIMP_IPA_TEST - variables: - PUPPET_VERSION: '~> 6.18' - BEAKER_PUPPET_COLLECTION: 'puppet6' - SIMP_BEAKER_OS: 'oracle' + <<: *pup_6_18_0__oracle script: - bundle exec rake spec_clean - bundle exec rake beaker:suites[ipa,el7_server] retry: 1 - -rpm_el6-puppet6: - stage: integration - image: 'ruby:2.5' - tags: - - beaker - <<: *cache_bundler - <<: *setup_bundler_env - <<: *only_with_SIMP_RELEASE_TESTS - variables: - PUPPET_VERSION: '~> 6.18' - BEAKER_PUPPET_COLLECTION: 'puppet6' - script: - - bundle exec rake spec_clean - - bundle exec rake beaker:suites[install_from_rpm,el6_server] - retry: 1 - rpm_el7-puppet6: stage: integration - image: 'ruby:2.5' tags: - beaker <<: *cache_bundler <<: *setup_bundler_env <<: *only_with_SIMP_RELEASE_TESTS - variables: - PUPPET_VERSION: '~> 6.18' - BEAKER_PUPPET_COLLECTION: 'puppet6' + <<: *pup_6_18_0 script: - bundle exec rake spec_clean - bundle exec rake beaker:suites[install_from_rpm,el7_server] retry: 1 -forge_install_el6-puppet6: - stage: integration - image: 'ruby:2.5' - tags: - - beaker - <<: *cache_bundler - <<: *setup_bundler_env - <<: *only_with_SIMP_RELEASE_TESTS - variables: - PUPPET_VERSION: '~> 6.18' - BEAKER_PUPPET_COLLECTION: 'puppet6' - script: - - bundle exec rake spec_clean - - bundle exec rake beaker:suites[install_from_core_module,el6_server] - retry: 1 - forge_install_el7-puppet6: stage: integration - image: 'ruby:2.5' tags: - beaker <<: *cache_bundler <<: *setup_bundler_env <<: *only_with_SIMP_RELEASE_TESTS - variables: - PUPPET_VERSION: '~> 6.18' - BEAKER_PUPPET_COLLECTION: 'puppet6' + <<: *pup_6_18_0 script: - bundle exec rake spec_clean - bundle exec rake beaker:suites[install_from_core_module,el7_server] diff --git a/Puppetfile.pinned b/Puppetfile.pinned index d8fbfa209..133d7cef0 100644 --- a/Puppetfile.pinned +++ b/Puppetfile.pinned @@ -16,7 +16,7 @@ moduledir 'src' mod 'simp-doc', :git => 'https://github.com/simp/simp-doc', - :tag => '6.5.0-2' + :tag => '6.5.0-3' moduledir 'src/assets' diff --git a/spec/acceptance/helpers/expect_script_helper.rb b/spec/acceptance/helpers/expect_script_helper.rb index bc77f9a86..067ea1c53 100644 --- a/spec/acceptance/helpers/expect_script_helper.rb +++ b/spec/acceptance/helpers/expect_script_helper.rb @@ -9,8 +9,13 @@ module ExpectScriptHelper # Using the (ASSUMED) optional, final command line argument in an expect # script, adjust ciphers used by that script to ssh from src_host to # dest_host, if necessary. This ugly adjustment is needed in order to - # deal with different cipher sets configured by SIMP for sshd for CentOS 6 - # versus CentOS 7. + # deal with different cipher sets configured by SIMP for sshd for + # different versions of CentOS. + # + # NOTE: this is probably possible to remove in favor of overriding the + # net-ssh options in the Beaker nodeset, which wasn't possible when + # SIMP-5082 was submitted. However, that will need to wait for a future + # patch. # # Returns the expect command def adjust_ssh_ciphers_for_expect_script(expect_cmd, src_host, dest_host) @@ -19,8 +24,6 @@ def adjust_ssh_ciphers_for_expect_script(expect_cmd, src_host, dest_host) dest_os_major = fact_on(dest_host, 'operatingsystemmajrelease') if src_os_major.to_s == '7' cmd +=" '-o MACs=hmac-sha1'" if (dest_os_major.to_s == '6') - elsif src_os_major.to_s == '6' - cmd +=" '-o MACs=hmac-sha2-256'" if (dest_os_major.to_s == '7') end cmd end diff --git a/spec/acceptance/helpers/repo_helper.rb b/spec/acceptance/helpers/repo_helper.rb index b9a1c0697..ef7176ace 100644 --- a/spec/acceptance/helpers/repo_helper.rb +++ b/spec/acceptance/helpers/repo_helper.rb @@ -36,14 +36,10 @@ def install_puppet_repo(host) puts("Using Puppet #{puppet_collection} repo from yum.puppetlabs.com") puts('='*72) - if host.host_hash[:platform] =~ /el-8/ - family = 'el-8' - elsif host.host_hash[:platform] =~ /el-7/ - family = 'el-7' - elsif host.host_hash[:platform] =~ /el-6/ - family = 'el-6' + if host.host_hash[:platform] =~ /(el-[78])/ + family = $1 else - fail("install_puppet_repo(): Cannot determine puppet repo for #{host.name}") + fail("install_puppet_repo(): No supported OS platform found for #{host.name}; unable to determine puppet repo") end url = "http://yum.puppetlabs.com/#{puppet_collection}/#{puppet_collection}-release-#{family}.noarch.rpm" on(host, "yum install #{url} -y") diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml index 319f60c7a..cbef7ff43 100644 --- a/spec/acceptance/nodesets/default.yml +++ b/spec/acceptance/nodesets/default.yml @@ -3,15 +3,12 @@ case ENV['SIMP_BEAKER_OS'] when /centos/ || /^el/ - box_6 = 'centos/6' box_7 = 'centos/7' box_8 = 'centos/8' when /oracle/ || /^oel/ - box_6 = 'onyxpoint/oel-6-x86_64' box_7 = 'onyxpoint/oel-7-x86_64' box_8 = 'generic/oracle8' else - box_6 = 'centos/6' box_7 = 'centos/7' box_8 = 'centos/8' end @@ -45,22 +42,6 @@ HOSTS: box: <%= box_7 %> hypervisor: <%= hypervisor %> - agent-el6: - roles: - - agent - platform: el-6-x86_64 - box: <%= box_6 %> - hypervisor: <%= hypervisor %> - ssh: - host_key: - - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:host_key].join("\n - ") %> - kex: - - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:kex].join("\n - ") %> - encryption: - - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:encryption].join("\n - ") %> - hmac: - - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:hmac].join("\n - ") %> - CONFIG: log_level: verbose type: aio diff --git a/spec/acceptance/nodesets/el6_server.yml b/spec/acceptance/nodesets/el6_server.yml deleted file mode 100644 index 1ebbb484b..000000000 --- a/spec/acceptance/nodesets/el6_server.yml +++ /dev/null @@ -1,75 +0,0 @@ -<% - hypervisor = ENV['BEAKER_HYPERVISOR'] || 'vagrant' - - case ENV['SIMP_BEAKER_OS'] - when /centos/ || /^el/ - box_6 = 'centos/6' - box_7 = 'centos/7' - when /oracle/ || /^oel/ - box_6 = 'onyxpoint/oel-6-x86_64' - box_7 = 'onyxpoint/oel-7-x86_64' - else - box_6 = 'centos/6' - box_7 = 'centos/7' - end --%> -HOSTS: - puppet: - roles: - - server # Mandatory - - master - - default - - simp_server - - agent - platform: el-6-x86_64 - box: <%= box_6 %> - hypervisor: <%= hypervisor %> - vagrant_memsize: 4608 - vagrant_cpus: 2 - ssh: - host_key: - - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:host_key].join("\n - ") %> - kex: - - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:kex].join("\n - ") %> - encryption: - - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:encryption].join("\n - ") %> - hmac: - - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:hmac].join("\n - ") %> - - agent-el7: - roles: - - agent - platform: el-7-x86_64 - box: <%= box_7 %> - hypervisor: <%= hypervisor %> - - agent-el6: - roles: - - agent - - syslog_server - platform: el-6-x86_64 - box: <%= box_6 %> - hypervisor: <%= hypervisor %> - ssh: - host_key: - - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:host_key].join("\n - ") %> - kex: - - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:kex].join("\n - ") %> - encryption: - - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:encryption].join("\n - ") %> - hmac: - - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:hmac].join("\n - ") %> - -CONFIG: - log_level: verbose - type: aio - vagrant_memsize: 256 - synced_folder: disabled - ssh: - keepalive: true - keepalive_interval: 10 -<% if ENV['BEAKER_PUPPET_COLLECTION'] -%> - puppet_collection: <%= ENV['BEAKER_PUPPET_COLLECTION'] %> -<% else -%> - puppet_collection: puppet6 -<% end -%> diff --git a/spec/acceptance/nodesets/el7_server.yml b/spec/acceptance/nodesets/el7_server.yml index 319f60c7a..cbef7ff43 100644 --- a/spec/acceptance/nodesets/el7_server.yml +++ b/spec/acceptance/nodesets/el7_server.yml @@ -3,15 +3,12 @@ case ENV['SIMP_BEAKER_OS'] when /centos/ || /^el/ - box_6 = 'centos/6' box_7 = 'centos/7' box_8 = 'centos/8' when /oracle/ || /^oel/ - box_6 = 'onyxpoint/oel-6-x86_64' box_7 = 'onyxpoint/oel-7-x86_64' box_8 = 'generic/oracle8' else - box_6 = 'centos/6' box_7 = 'centos/7' box_8 = 'centos/8' end @@ -45,22 +42,6 @@ HOSTS: box: <%= box_7 %> hypervisor: <%= hypervisor %> - agent-el6: - roles: - - agent - platform: el-6-x86_64 - box: <%= box_6 %> - hypervisor: <%= hypervisor %> - ssh: - host_key: - - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:host_key].join("\n - ") %> - kex: - - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:kex].join("\n - ") %> - encryption: - - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:encryption].join("\n - ") %> - hmac: - - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:hmac].join("\n - ") %> - CONFIG: log_level: verbose type: aio diff --git a/spec/acceptance/shared_examples/simp_server_bootstrap.rb b/spec/acceptance/shared_examples/simp_server_bootstrap.rb index 75a4b929d..ba8be3675 100644 --- a/spec/acceptance/shared_examples/simp_server_bootstrap.rb +++ b/spec/acceptance/shared_examples/simp_server_bootstrap.rb @@ -38,24 +38,6 @@ 'simp_rsyslog::forward_logs' => true } ) - if config.fetch(:simp_ldap_server, true) - # Work around 128-bit cipher problems - # TODO: Once SIMP-5507 is addressed, this workaround is *only* - # required when the el6 LDAP server is not in FIPS mode. - if master.host_hash[:platform] =~ /el-6/ - hiera.merge!( { - 'simp_openldap::server::conf::security' => [ - 'ssf=128', - 'tls=128', - 'update_ssf=128', - 'simple_bind=128', - 'update_tls=128', - ], - 'pupmod::master::generate_types::enable' => false - } ) - end - end - if config.has_key?(:other_hiera) hiera.merge!( config[:other_hiera] ) end diff --git a/spec/acceptance/suites/README.md b/spec/acceptance/suites/README.md index 0671162e6..246e1d2e4 100644 --- a/spec/acceptance/suites/README.md +++ b/spec/acceptance/suites/README.md @@ -22,9 +22,9 @@ This directory contains In general, the SIMP integration/release test suites follow the same general procedure: -1. Spin up at least 4 vagrant boxes +1. Spin up at least 3 vagrant boxes - * One puppetserver, 1 EL8 client, 1 EL7 client, 1 EL6 client. + * One puppetserver, 1 EL8 client, 1 EL7 client * EL version of the puppetserver changes based on nodeset. * One of the clients is a rsyslog server, whose EL version also changes based on nodeset. @@ -64,12 +64,12 @@ builds/download RPMs, and then builds the ISO. 6. Determine the nodeset appropriate for your test. - * Each integration/(pre-)release test suite contains are two nodesets: - `el7_server` and `el6_server`. These nodesets control the EL version - of both the puppsetserver and rsyslog server. - * The `el6_server` nodeset does not test integration with an EL8 client. - * The `rpm_docker` test suite contains two nodesets, `el7.yml` and - `el6.yml`, for building a SIMP EL7 ISO and SIMP EL6 ISO, respectively. + * Each integration/(pre-)release test suite contains a nodeset for each + supported EL server (currently: `el7_server`). These nodesets control the + EL version of both the puppsetserver and rsyslog server. + * The `rpm_docker` test suite contains nodesets for building an ISO for + various OSes (e.g., `rpm_docker/nodesets/el7.yml`, + `rpm_docker/nodesets/el8.yml`) 7. Run the tests for a suite and selected nodeset. For example, @@ -81,11 +81,11 @@ bundle exec rake beaker:suites[default,el7_server] ``` ```bash -# to run the default suite on OEL using Puppet 6 and an OEL6 simp server +# to run the default suite on OEL using Puppet 6 and an OEL7 simp server export PUPPET_VERSION='~> 6.18' export BEAKER_PUPPET_COLLECTION='puppet6' export SIMP_BEAKER_OS='oracle' -bundle exec rake beaker:suites[default,el6_server] +bundle exec rake beaker:suites[default,el7_server] ``` ### `default` Suite @@ -115,8 +115,8 @@ clients, and then executes the following tests: * Subset of `simp environment new` operations 5. _Compliance enforcement and reporting_: Enables compliance enforcement and - reporting via the `simp-compliance_markup` module and then evalutes the - results. + reporting via the `simp-compliance_markup` module and then evaluates the + results. #### yum repositories enabled @@ -145,7 +145,7 @@ Details: * In the production environment creates a Puppetfile containing only the module entries from `Puppetfile.pinned` * Downloads modules to the production environment's module directory via - `r10k puppetfile install` of the module Puppetfile + `r10k puppetfile install` of the module Puppetfile * Uses `simp` CLI to fix the permissions of the downloaded modules #### Environment variables @@ -186,9 +186,9 @@ Details: 1. Installs assets: * Creates a Puppetfile containing only the asset entries from - `Puppetfile.pinned` + `Puppetfile.pinned`. * Downloads assets to a staging directory via `r10k puppetfile install` of - the asset Puppetfile + the asset Puppetfile. * Manually completes asset installation using commands that (largely) mimic each asset's RPM installation. @@ -387,7 +387,7 @@ Sets the test VM box types. Valid values are `centos`, `oracle`, and `oel`. * **unset** - Defaults to `centos` -* When `centos`, uses `centso/8`, `centos/7` and `centos/6` boxes. -* When `oracle` or `oel`, uses `generic/oracle8`, `onyxpoint/oel-7-x86_64` and - `onyxpoint/oel-6-x86_64` boxes. -* Any other value defaults to `centos/8`,`centos/7` and `centos/6` boxes. +* When `centos`, uses `centso/8` and `centos/7` boxes. +* When `oracle` or `oel`, uses the boxes `generic/oracle8` and + `onyxpoint/oel-7-x86_64` +* Any other value defaults to `centos/8` and `centos/7`. diff --git a/spec/acceptance/suites/ipa/10_ipa_server_spec.rb b/spec/acceptance/suites/ipa/10_ipa_server_spec.rb index 77fc53d3b..c1cb7c31c 100644 --- a/spec/acceptance/suites/ipa/10_ipa_server_spec.rb +++ b/spec/acceptance/suites/ipa/10_ipa_server_spec.rb @@ -32,10 +32,6 @@ ipa_server.upgrade_package('nss') ipa_server.install_package('ipa-server') ipa_server.install_package('ipa-server-dns') - if ipa_server.host_hash[:platform] =~ /el-6/ - ipa_server.install_package('bind') - ipa_server.install_package('bind-dyndb-ldap') - end end it 'should make sure the hostname is fully qualified' do diff --git a/spec/acceptance/suites/ipa/30_ipa_spec.rb b/spec/acceptance/suites/ipa/30_ipa_spec.rb index a55eeb4db..efe88b64d 100644 --- a/spec/acceptance/suites/ipa/30_ipa_spec.rb +++ b/spec/acceptance/suites/ipa/30_ipa_spec.rb @@ -20,7 +20,7 @@ out = run_ipa_cmd(ipa_server, "ipa dnsrecord-find #{ipa_domain}") records = out.stdout.split("\n").grep(/Record name/).map {|h|h.split(': ').last} - %w[ puppet ipa agent-el6 agent-el7 ].each do |host| + %w[puppet ipa agent-el7].each do |host| expect(records).to include(host) end end @@ -92,7 +92,6 @@ login << 'ssh' login << '-o PubkeyAuthentication=no' login << '-o StrictHostKeyChecking=no' - login << '-m hmac-sha1' if client.host_hash[:platform] =~ /el-6/ login << '-l testuser' login << client.name login << 'uptime' diff --git a/spec/acceptance/suites/ipa/nodesets/el6_server.yml b/spec/acceptance/suites/ipa/nodesets/el6_server.yml deleted file mode 100644 index de581cc71..000000000 --- a/spec/acceptance/suites/ipa/nodesets/el6_server.yml +++ /dev/null @@ -1,103 +0,0 @@ -<% - hypervisor = ENV['BEAKER_HYPERVISOR'] || 'vagrant' - - case ENV['SIMP_BEAKER_OS'] - when /centos/ || /^el/ - box_6 = 'centos/6' - box_7 = 'centos/7' - when /oracle/ || /^oel/ - box_6 = 'onyxpoint/oel-6-x86_64' - box_7 = 'onyxpoint/oel-7-x86_64' - else - box_6 = 'centos/6' - box_7 = 'centos/7' - end --%> -HOSTS: - puppet: - roles: - - server # Mandatory - - master - - default - - simp_server - - agent - - ipa_client - platform: el-6-x86_64 - box: <%= box_6 %> - hypervisor: <%= hypervisor %> - vagrant_memsize: 4608 - vagrant_cpus: 2 - ssh: - host_key: - - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:host_key].join("\n - ") %> - kex: - - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:kex].join("\n - ") %> - encryption: - - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:encryption].join("\n - ") %> - hmac: - - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:hmac].join("\n - ") %> - - - - ipa: - roles: - - ipa_server - - agent - platform: el-6-x86_64 - box: <%= box_6 %> - hypervisor: <%= hypervisor %> - vagrant_memsize: 2048 - vagrant_cpus: 2 - ssh: - host_key: - - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:host_key].join("\n - ") %> - kex: - - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:kex].join("\n - ") %> - encryption: - - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:encryption].join("\n - ") %> - hmac: - - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:hmac].join("\n - ") %> - - - - agent-el7: - roles: - - agent - - ipa_client - platform: el-7-x86_64 - box: <%= box_7 %> - hypervisor: <%= hypervisor %> - - agent-el6: - roles: - - agent - - syslog_server - - ipa_client - platform: el-6-x86_64 - box: <%= box_6 %> - hypervisor: <%= hypervisor %> - ssh: - host_key: - - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:host_key].join("\n - ") %> - kex: - - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:kex].join("\n - ") %> - encryption: - - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:encryption].join("\n - ") %> - hmac: - - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:hmac].join("\n - ") %> - - - -CONFIG: - log_level: verbose - type: aio - vagrant_memsize: 256 - ssh: - keepalive: true - keepalive_interval: 1 - synced_folder: disabled -<% if ENV['BEAKER_PUPPET_COLLECTION'] -%> - puppet_collection: <%= ENV['BEAKER_PUPPET_COLLECTION'] %> -<% else -%> - puppet_collection: puppet6 -<% end -%> diff --git a/spec/acceptance/suites/ipa/nodesets/el7_server.yml b/spec/acceptance/suites/ipa/nodesets/el7_server.yml index 3e8ab7108..67d98e625 100644 --- a/spec/acceptance/suites/ipa/nodesets/el7_server.yml +++ b/spec/acceptance/suites/ipa/nodesets/el7_server.yml @@ -3,13 +3,10 @@ case ENV['SIMP_BEAKER_OS'] when /centos/ || /^el/ - box_6 = 'centos/6' box_7 = 'centos/7' when /oracle/ || /^oel/ - box_6 = 'onyxpoint/oel-6-x86_64' box_7 = 'onyxpoint/oel-7-x86_64' else - box_6 = 'centos/6' box_7 = 'centos/7' end -%> @@ -47,24 +44,6 @@ HOSTS: box: <%= box_7 %> hypervisor: <%= hypervisor %> - agent-el6: - roles: - - agent - - ipa_client - platform: el-6-x86_64 - box: <%= box_6 %> - hypervisor: <%= hypervisor %> - ssh: - host_key: - - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:host_key].join("\n - ") %> - kex: - - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:kex].join("\n - ") %> - encryption: - - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:encryption].join("\n - ") %> - hmac: - - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:hmac].join("\n - ") %> - - CONFIG: log_level: verbose type: aio diff --git a/spec/acceptance/suites/rpm_docker/nodesets/el6.yml b/spec/acceptance/suites/rpm_docker/nodesets/el6.yml deleted file mode 100644 index db8f16aed..000000000 --- a/spec/acceptance/suites/rpm_docker/nodesets/el6.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- -HOSTS: - el6-build-server: - roles: - - primary - platform: el-6-x86_64 - hypervisor: docker - image: simpproject/simp_build_centos6 - docker_preserve_image: true - -CONFIG: -<% unless ENV['TRAVIS'] -%> - mount_folders: - simp_core: - host_path: './' - container_path: '/simp-core' -<% end -%> - log_level: verbose - type: aio