simp-rake-helpers 5.24.0 → 6.0.0

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 5.24.0
+  version: 6.0.0
 platform: ruby
 authors:
 - Chris Tessmer
 - Trevor Vaughan
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-20 00:00:00.000000000 Z
+date: 2026-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simp-beaker-helpers
@@ -17,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +33,7 @@ dependencies:
         version: '1.14'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,7 +43,7 @@ dependencies:
         version: '1.14'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -71,7 +70,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '8.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '9.0'
@@ -81,10 +80,30 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '8.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '9.0'
+- !ruby/object:Gem::Dependency
+  name: puppet-modulebuilder
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: puppet-lint
   requirement: !ruby/object:Gem::Requirement
@@ -146,25 +165,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: puppetlabs_spec_helper
+  name: voxpupuli-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '14.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '9.0'
+        version: '15.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '14.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '9.0'
+        version: '15.0'
 - !ruby/object:Gem::Dependency
   name: metadata-json-lint
   requirement: !ruby/object:Gem::Requirement
@@ -189,16 +208,22 @@ dependencies:
   name: parallel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: simp-rspec-puppet-facts
   requirement: !ruby/object:Gem::Requirement
@@ -351,8 +376,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- bin/simp_rake_helpers
-- lib/simp/ci/gitlab.rb
 - lib/simp/command_utils.rb
 - lib/simp/componentinfo.rb
 - lib/simp/local_gpg_signing_key.rb
@@ -373,7 +396,6 @@ files:
 - lib/simp/rake/build/unpack.rb
 - lib/simp/rake/build/upload.rb
 - lib/simp/rake/build/vermap.yaml
-- lib/simp/rake/ci.rb
 - lib/simp/rake/fixtures.rb
 - lib/simp/rake/helpers.rb
 - lib/simp/rake/helpers/assets/Gemfile
@@ -383,13 +405,15 @@ files:
 - lib/simp/rake/helpers/version.rb
 - lib/simp/rake/pkg.rb
 - lib/simp/rake/pupmod/helpers.rb
+- lib/simp/rake/pupmod/module_build.rb
 - lib/simp/rake/rubygem.rb
 - lib/simp/relchecks.rb
 - lib/simp/rpm.rb
 - lib/simp/rpm_signer.rb
 - lib/simp/yum.rb
-- spec/acceptance/nodesets/default.yml
-- spec/acceptance/nodesets/default_ruby3_1.yml
+- spec/acceptance/nodesets/almalinux10.yml
+- spec/acceptance/nodesets/almalinux8.yml
+- spec/acceptance/nodesets/almalinux9.yml
 - spec/acceptance/suites/default/00_pkg_rpm_custom_scriptlets_spec.rb
 - spec/acceptance/suites/default/10_pkg_rpm_spec.rb
 - spec/acceptance/suites/default/30_pkg_misc_spec.rb
@@ -475,58 +499,6 @@ files:
 - spec/acceptance/suites/default/support/build_user_helpers.rb
 - spec/acceptance/suites/default/support/pkg_rpm_helpers.rb
 - spec/acceptance/support/simp_rake_helpers.rb
-- spec/lib/simp/ci/files/global_nodesets_only/spec/acceptance/nodesets/default.yml
-- spec/lib/simp/ci/files/global_nodesets_only/spec/acceptance/nodesets/oel.yml
-- spec/lib/simp/ci/files/job_broken_link_nodeset/spec/acceptance/nodesets/centos.yml
-- spec/lib/simp/ci/files/job_broken_link_nodeset/spec/acceptance/nodesets/oel.yml
-- spec/lib/simp/ci/files/job_broken_link_nodeset/spec/acceptance/suites/default/class_spec.rb
-- spec/lib/simp/ci/files/job_invalid_nodeset/spec/acceptance/nodesets/default.yml
-- spec/lib/simp/ci/files/job_invalid_nodeset/spec/acceptance/nodesets/oel.yml
-- spec/lib/simp/ci/files/job_invalid_nodeset/spec/acceptance/suites/default/class_spec.rb
-- spec/lib/simp/ci/files/job_invalid_suite/spec/acceptance/nodesets/default.yml
-- spec/lib/simp/ci/files/job_invalid_suite/spec/acceptance/nodesets/oel.yml
-- spec/lib/simp/ci/files/job_invalid_suite/spec/acceptance/suites/default/class_spec.rb
-- spec/lib/simp/ci/files/job_missing_nodeset/spec/acceptance/nodesets/default.yml
-- spec/lib/simp/ci/files/job_missing_nodeset/spec/acceptance/nodesets/oel.yml
-- spec/lib/simp/ci/files/job_missing_nodeset/spec/acceptance/suites/default/class_spec.rb
-- spec/lib/simp/ci/files/job_missing_suite_and_nodeset/spec/acceptance/nodesets/default.yml
-- spec/lib/simp/ci/files/job_missing_suite_and_nodeset/spec/acceptance/nodesets/oel.yml
-- spec/lib/simp/ci/files/job_missing_suite_and_nodeset/spec/acceptance/suites/default/class_spec.rb
-- spec/lib/simp/ci/files/multiple_invalid_jobs/spec/acceptance/nodesets/default.yml
-- spec/lib/simp/ci/files/multiple_invalid_jobs/spec/acceptance/nodesets/oel.yml
-- spec/lib/simp/ci/files/multiple_invalid_jobs/spec/acceptance/suites/default/class_spec.rb
-- spec/lib/simp/ci/files/multiple_invalid_jobs/spec/acceptance/suites/feature-1/feature-1_spec.rb
-- spec/lib/simp/ci/files/multiple_invalid_jobs/spec/acceptance/suites/feature_2/feature_2_spec.rb
-- spec/lib/simp/ci/files/multiple_invalid_jobs/spec/acceptance/suites/feature_2/nodesets/default.yml
-- spec/lib/simp/ci/files/multiple_invalid_jobs/spec/acceptance/suites/feature_2/nodesets/oel.yml
-- spec/lib/simp/ci/files/multiple_valid_jobs/spec/acceptance/nodesets/default.yml
-- spec/lib/simp/ci/files/multiple_valid_jobs/spec/acceptance/nodesets/oel.yml
-- spec/lib/simp/ci/files/multiple_valid_jobs/spec/acceptance/suites/default/class_spec.rb
-- spec/lib/simp/ci/files/multiple_valid_jobs/spec/acceptance/suites/feature-1/feature-1_spec.rb
-- spec/lib/simp/ci/files/multiple_valid_jobs/spec/acceptance/suites/feature_2/feature_2_spec.rb
-- spec/lib/simp/ci/files/multiple_valid_jobs/spec/acceptance/suites/feature_2/nodesets/default.yml
-- spec/lib/simp/ci/files/multiple_valid_jobs/spec/acceptance/suites/feature_2/nodesets/oel.yml
-- spec/lib/simp/ci/files/no_acceptance_tests/spec/spec_helper.rb
-- spec/lib/simp/ci/files/no_gitlab_config_with_tests/spec/acceptance/nodesets/default.yml
-- spec/lib/simp/ci/files/no_gitlab_config_with_tests/spec/acceptance/nodesets/oel.yml
-- spec/lib/simp/ci/files/no_gitlab_config_with_tests/spec/acceptance/suites/default/class_spec.rb
-- spec/lib/simp/ci/files/no_gitlab_config_without_tests/spec/acceptance/nodesets/default.yml
-- spec/lib/simp/ci/files/no_gitlab_config_without_tests/spec/acceptance/nodesets/oel.yml
-- spec/lib/simp/ci/files/suite_skeleton_only/spec/acceptance/nodesets/centos.yml
-- spec/lib/simp/ci/files/suite_skeleton_only/spec/acceptance/nodesets/oel.yml
-- spec/lib/simp/ci/files/valid_job_global_nodeset/spec/acceptance/nodesets/default.yml
-- spec/lib/simp/ci/files/valid_job_global_nodeset/spec/acceptance/nodesets/oel.yml
-- spec/lib/simp/ci/files/valid_job_global_nodeset/spec/acceptance/suites/default/class_spec.rb
-- spec/lib/simp/ci/files/valid_job_nodeset_dir_link/spec/acceptance/nodesets/default.yml
-- spec/lib/simp/ci/files/valid_job_nodeset_dir_link/spec/acceptance/nodesets/oel.yml
-- spec/lib/simp/ci/files/valid_job_nodeset_dir_link/spec/acceptance/suites/default/class_spec.rb
-- spec/lib/simp/ci/files/valid_job_nodeset_link/spec/acceptance/suites/default/class_spec.rb
-- spec/lib/simp/ci/files/valid_job_nodeset_link/spec/acceptance/suites/default/nodesets/centos.yml
-- spec/lib/simp/ci/files/valid_job_nodeset_link/spec/acceptance/suites/default/nodesets/oel.yml
-- spec/lib/simp/ci/files/valid_job_suite_nodeset/spec/acceptance/suites/default/class_spec.rb
-- spec/lib/simp/ci/files/valid_job_suite_nodeset/spec/acceptance/suites/default/nodesets/default.yml
-- spec/lib/simp/ci/files/valid_job_suite_nodeset/spec/acceptance/suites/default/nodesets/oel.yml
-- spec/lib/simp/ci/gitlab_spec.rb
 - spec/lib/simp/command_utils_spec.rb
 - spec/lib/simp/componentinfo_changelog_regex_spec.rb
 - spec/lib/simp/componentinfo_spec.rb
@@ -637,6 +609,7 @@ files:
 - spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/spec_helper.rb
 - spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/spec_helper_acceptance.rb
 - spec/lib/simp/rake/pupmod/helpers_spec.rb
+- spec/lib/simp/rake/pupmod/module_build_spec.rb
 - spec/lib/simp/rake_spec.rb
 - spec/lib/simp/relchecks_check_rpm_changelog_spec.rb
 - spec/lib/simp/relchecks_compare_latest_tag_spec.rb
@@ -650,7 +623,6 @@ licenses:
 - Apache-2.0
 metadata:
   issue_tracker: https://github.com/simp/rubygem-simp-rake-helpers/issues
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -665,8 +637,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 4.0.10
 specification_version: 4
 summary: SIMP rake helpers
 test_files: []

data/bin/simp_rake_helpers

@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-
-abort "you need to write me"

data/lib/simp/ci/gitlab.rb

@@ -1,226 +0,0 @@
-module Simp; end
-module Simp::Ci; end
-
-# Class that provides GitLab-CI-related methods
-class Simp::Ci::Gitlab
-  require 'yaml'
-  require 'json'
-
-  # base class for errors
-  class Error < StandardError ; end
-
-  # incorrectly configured GitLab job
-  class JobError < Error ; end
-
-  # incorrectly configured gitlab-ci.yml
-  class LintError < Error ; end
-
-  # @param component_dir Root directory of the component project
-  def initialize(component_dir)
-    @component_dir = component_dir
-    @gitlab_config_file = File.join(@component_dir, '.gitlab-ci.yml')
-    @gitlab_yaml = nil
-    @acceptance_dir = File.join(@component_dir, 'spec', 'acceptance')
-    @suites_dir = File.join(@acceptance_dir, 'suites')
-
-    # for reporting purposes, just use the name of the component
-    # directory as the component name
-    @component = File.basename(component_dir)
-  end
-
-  # @return true when config is the hash for an acceptance test job
-  def acceptance_job?(config)
-    config.is_a?(Hash) &&
-    config.has_key?('script') &&
-    (config.has_key?('stage') && (config['stage'] == 'acceptance'))
-  end
-
-  # @return whether the project has any suite-based acceptance tests
-  def acceptance_tests?
-    tests_found = false
-    suite_dirs = Dir.glob(File.join(@suites_dir, '*'))
-    suite_dirs.delete_if { |x| ! File.directory?(x) }
-    suite_dirs.each do |suite_dir|
-      tests = Dir.glob(File.join(suite_dir, '*_spec.rb'))
-      next if tests.empty?
-      nodesets = Dir.glob(File.join(suite_dir, 'nodesets', '*.yml'))
-      if nodesets.empty?
-        nodesets = Dir.glob(File.join(@acceptance_dir, 'nodesets', '*.yml'))
-      end
-      unless nodesets.empty?
-        tests_found = true
-        break
-      end
-    end
-    tests_found
-  end
-
-  # @return path to a suite's nodeset YAML file if it exists or nil otherwise
-  #
-  # If the suite has no 'nodesets' directory, it will search for the
-  # nodeset YAML in the global nodeset directory.
-  #
-  def find_nodeset_yaml(suite, nodeset)
-    nodeset_yml = nil
-    suite_nodesets_dir = File.join(@suites_dir, suite, 'nodesets')
-    if Dir.exist?(suite_nodesets_dir)
-      nodeset_yml = File.join(suite_nodesets_dir, "#{nodeset}.yml")
-      nodeset_yml = nil unless File.exist?(nodeset_yml)
-    else
-      nodeset_yml = File.join(@acceptance_dir, 'nodesets', "#{nodeset}.yml")
-      nodeset_yml = nil unless File.exist?(nodeset_yml)
-    end
-    nodeset_yml
-  end
-
-  # Loads .gitlab-ci.yml
-  # @return Hash of GitLab configuration
-  # @raise Simp::Ci::Gitlab::LintError if YAML is malformed
-  def load_gitlab_yaml
-    return @gitlab_yaml if @gitlab_yaml
-
-    begin
-      @gitlab_yaml = YAML.safe_load(File.read(@gitlab_config_file), filename: @gitlab_config_file, aliases: true)
-    rescue Psych::SyntaxError => e
-      msg = "ERROR: Malformed YAML: #{e.message}"
-      raise LintError.new(msg)
-    end
-
-    @gitlab_yaml
-  end
-
-  # Validate GitLab acceptance test job specifications
-  #
-  # Verify each acceptance test job specifies both a valid suite and
-  # a valid nodeset
-  #
-  # @raise Simp::Ci::Gitlab::JobError if validation fails.
-  #   Validation will fail under the following conditions
-  #   (1) an acceptance test job is missing the suite or nodeset
-  #   (2) an acceptance test job contains an invalid suite or nodeset
-  #
-  def validate_acceptance_test_jobs
-    return unless File.exist?(@gitlab_config_file)
-
-    failures = []
-
-    gitlab_yaml = load_gitlab_yaml
-    gitlab_yaml.each do |key, value|
-      next unless acceptance_job?(value)
-
-      value['script'].each do |line|
-        next unless line.include? 'beaker:suites'
-        if line.include?('[')
-          match = line.match(/beaker:suites\[([\w\-_]*)(,([\w\-_]*))?\]/)
-          suite = match[1]
-          nodeset = match[3]
-
-          if ! valid_suite?(suite)
-            failures << "#{@component} job '#{key}' uses invalid suite '#{suite}': '#{line}'"
-          elsif nodeset.nil?
-            failures << "#{@component} job '#{key}' missing nodeset: '#{line}'"
-          elsif ! find_nodeset_yaml(suite, nodeset)
-            failures << "#{@component} job '#{key}' uses invalid nodeset '#{nodeset}': '#{line}'"
-          end
-        else
-          failures <<  "#{@component} job '#{key}' missing suite and nodeset: '#{line}'"
-        end
-      end
-    end
-
-    unless failures.empty?
-      separator = "\n   "
-      msg = "Invalid GitLab acceptance test config:#{separator}#{failures.join(separator)}"
-      raise JobError.new(msg)
-    end
-  end
-
-  # Validate gitlab configuration
-  #
-  # Validation performed
-  # - Verifies configuration file is valid YAML
-  # --Verifies configuration file passes GitLab lint check, when connectivity
-  #   to GitLab is available
-  # - Verifies acceptance test job configuration has valid suites and nodesets
-  # @raise Simp::Ci::Gitlab::Error upon any validation failure
-  #
-  def validate_config
-    if File.exist?(@gitlab_config_file)
-      validate_yaml
-      validate_acceptance_test_jobs
-    elsif acceptance_tests?
-      # can't assume this is a failure, so just warn
-      puts "WARNING:  #{@component} has acceptance tests but no .gitlab-ci.yml"
-    end
-  end
-
-  # Verifies gitlab-ci.yml is valid YAML and, when possible, passes GitLab
-  # lint checks
-  # @raise Simp::Ci::Gitlab::LintError upon any failure
-  def validate_yaml
-    return unless File.exist?(@gitlab_config_file)
-
-    # first check for malformed yaml
-    gitlab_yaml = load_gitlab_yaml
-
-    # apply GitLab lint check
-    begin
-      gitlab_config_json = gitlab_yaml.to_json
-    rescue Exception => e
-      # really should never get here....
-      puts "WARNING: Could not lint check #{@component}'s GitLab configuration: query could not be formed"
-      return
-    end
-
-    curl ||= %x(which curl).strip
-    if curl.empty?
-      puts "WARNING: Could not lint check #{@component}'s GitLab configuration: Could not find 'curl'"
-      return
-    end
-
-    query = [
-      curl,
-      '--silent',
-      '--header "Content-Type: application/json"',
-      'https://gitlab.com/api/v4/ci/lint',
-      '--data', "'{\"content\":#{gitlab_config_json.dump}}'"
-    ]
-    result = `#{query.join(' ')}`
-
-    status = :unknown
-    errors = nil
-    begin
-      result_hash = JSON.load(result)
-      # if stdout is empty, result_hash will be nil
-      unless result_hash.nil?
-        if result_hash.has_key?('status')
-          if result_hash['status'] == 'valid'
-            status = :valid
-          else
-            status = :invalid
-            errors = result_hash['errors']
-          end
-        end
-      end
-
-    rescue
-      # stdout does not contain JSON...don't know what happened!
-    end
-
-    if status == :unknown
-      puts "WARNING: Unable to lint check #{@component}'s GitLab configuration"
-    elsif status == :invalid
-      separator = "\n   "
-      msg = "ERROR: Invalid GitLab config:#{separator}#{errors.join(separator)}"
-      raise LintError.new(msg)
-    end
-  end
-
-
-  def valid_suite?(suite)
-    suite_dir = File.join(@suites_dir, suite)
-    #TODO check for suites that have no tests?
-    return Dir.exist?(suite_dir)
-  end
-
-end

data/lib/simp/rake/ci.rb

@@ -1,31 +0,0 @@
-require 'rake/tasklib'
-require 'simp/ci/gitlab'
-
-module Simp; end
-module Simp::Rake
-  class Ci < ::Rake::TaskLib
-    def initialize( dir )
-       @base_dir = dir
-       define
-    end
-
-    def define
-      namespace :simp do
-
-        desc 'Validate CI configuration'
-        task :ci_lint => [:gitlab_ci_lint] do
-        end
-
-        desc 'Validate GitLab CI configuration'
-        task :gitlab_ci_lint do
-          # only validation so far is as follows:
-          # - config file is valid YAML
-          # - config file passes GitLab lint check, when GitLab available
-          # - acceptance test job config has valid suites and nodesets
-          Simp::Ci::Gitlab.new(@base_dir).validate_config
-        end
-
-      end
-    end
-  end
-end

data/spec/lib/simp/ci/files/global_nodesets_only/spec/acceptance/nodesets/default.yml

@@ -1,41 +0,0 @@
-<%
-  if ENV['BEAKER_HYPERVISOR']
-    hypervisor = ENV['BEAKER_HYPERVISOR']
-  else
-    hypervisor = 'vagrant'
-  end
--%>
-HOSTS:
-  client:
-    roles:
-      - default
-      - master
-      - client
-    platform: el-7-x86_64
-    box: centos/7
-    hypervisor: <%= hypervisor %>
-  server-1:
-    roles:
-      - server
-    platform: el-7-x86_64
-    box: centos/7
-    hypervisor: <%= hypervisor %>
-  server-2:
-    roles:
-      - server
-    platform: el-6-x86_64
-    box: centos/6
-    hypervisor: <%= hypervisor %>
-  server-3:
-    roles:
-      - failover_server
-    platform: el-7-x86_64
-    box: centos/7
-    hypervisor: <%= hypervisor %>
-CONFIG:
-  log_level: verbose
-  type: aio
-  vagrant_memsize: 256
-<% if ENV['BEAKER_PUPPET_COLLECTION'] -%>
-  puppet_collection: <%= ENV['BEAKER_PUPPET_COLLECTION'] %>
-<% end -%>

data/spec/lib/simp/ci/files/global_nodesets_only/spec/acceptance/nodesets/oel.yml

@@ -1,41 +0,0 @@
-<%
-  if ENV['BEAKER_HYPERVISOR']
-    hypervisor = ENV['BEAKER_HYPERVISOR']
-  else
-    hypervisor = 'vagrant'
-  end
--%>
-HOSTS:
-  client:
-    roles:
-      - default
-      - master
-      - client
-    platform: el-7-x86_64
-    box: onyxpoint/oel-7-x86_64
-    hypervisor: <%= hypervisor %>
-  server-1:
-    roles:
-      - server
-    platform: el-7-x86_64
-    box: onyxpoint/oel-7-x86_64
-    hypervisor: <%= hypervisor %>
-  server-2:
-    roles:
-      - server
-    platform: el-6-x86_64
-    box: onyxpoint/oel-7-x86_64
-    hypervisor: <%= hypervisor %>
-  server-3:
-    roles:
-      - failover_server
-    platform: el-7-x86_64
-    box: onyxpoint/oel-7-x86_64
-    hypervisor: <%= hypervisor %>
-CONFIG:
-  log_level:       verbose
-  type:            aio
-  vagrant_memsize: 256
-<% if ENV['BEAKER_PUPPET_COLLECTION'] -%>
-  puppet_collection: <%= ENV['BEAKER_PUPPET_COLLECTION'] %>
-<% end -%>

data/spec/lib/simp/ci/files/job_broken_link_nodeset/spec/acceptance/nodesets/centos.yml

@@ -1,41 +0,0 @@
-<%
-  if ENV['BEAKER_HYPERVISOR']
-    hypervisor = ENV['BEAKER_HYPERVISOR']
-  else
-    hypervisor = 'vagrant'
-  end
--%>
-HOSTS:
-  client:
-    roles:
-      - default
-      - master
-      - client
-    platform: el-7-x86_64
-    box: centos/7
-    hypervisor: <%= hypervisor %>
-  server-1:
-    roles:
-      - server
-    platform: el-7-x86_64
-    box: centos/7
-    hypervisor: <%= hypervisor %>
-  server-2:
-    roles:
-      - server
-    platform: el-6-x86_64
-    box: centos/6
-    hypervisor: <%= hypervisor %>
-  server-3:
-    roles:
-      - failover_server
-    platform: el-7-x86_64
-    box: centos/7
-    hypervisor: <%= hypervisor %>
-CONFIG:
-  log_level: verbose
-  type: aio
-  vagrant_memsize: 256
-<% if ENV['BEAKER_PUPPET_COLLECTION'] -%>
-  puppet_collection: <%= ENV['BEAKER_PUPPET_COLLECTION'] %>
-<% end -%>