simp-beaker-helpers 1.13.0 → 1.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9229a2699ed6767059dee0f1b835dece7284420aabc219a0f195f6b9d0d0622
-  data.tar.gz: 99f9de96732cd0e07f02fc29c1af20fc6390bf67a55d22046eb93f836b8a377c
+  metadata.gz: 8bd7cad880ca341adea6a150fffbf724759599f673a2164022e4b77d1fabec0e
+  data.tar.gz: d9dd6b4e5712556733a735bb0ad6e66c2e200075f14fd567f044facdc15f392c
 SHA512:
-  metadata.gz: 2289cd0e1bff87e03cad29ee5f36d0f609b2ee2d0ccdff5101a22e5df5ba26a21b44e79d9bb228607d670e51a6c55dfad57d149179844cece4edbfdfc46fcbd7
-  data.tar.gz: 84557eec4604ec94fec37c4a47415fdba716ccbc5c2c7d92f5d6f1e87f63774c9a6004006541aa58ed8f441ca3e8a86094c2892d90d3716b1a173e21bde1302f
+  metadata.gz: a50c5176e579f344d13fb86dcfeeb9c5e2b3bc59a69f4277824f3b8bec92baa38e52ed1085c1cc621b03e1d7087d7cdca05ae4665f466e0a8cb93719e345ad39
+  data.tar.gz: 85fc20afb96e3d4b157ed479d8d808e3bd7050de38018bb38ef0dd72a93c8ce66a78652da7f76b6cbe519b6a16c233d40304a71fb0434aa2cc80a940046b67c8

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 1.13.1 / 2019-02-02
+* Ensure that SUTs have an FQDN set and not just a short hostname
+* Work around issue where the SSG doesn't build the STIG for CentOS any longer.
+* Add a work around for getting the docker SUT ID due to breaking changes in
+  the beaker-docker gem
+
 ### 1.13.0 / 2018-11-09
 * Make the SSG reporting consistent with the InSpec reporting
   * Thanks to Liz Nemsick for the original result processing code

data/lib/simp/beaker_helpers.rb

@@ -49,7 +49,13 @@ module Simp::BeakerHelpers
         end
       end
 
-      %x(tar #{exclude_list.join(' ')} -hcf - -C "#{File.dirname(src)}" "#{File.basename(src)}" | docker exec -i "#{sut.host_hash[:docker_container].id}" tar -C "#{dest}" -xf -)
+      # Work around for breaking changes in beaker-docker
+      if sut.host_hash[:docker_container]
+        container_id = sut.host_hash[:docker_container].id
+      else
+        container_id = sut.host_hash[:docker_container_id]
+      end
+      %x(tar #{exclude_list.join(' ')} -hcf - -C "#{File.dirname(src)}" "#{File.basename(src)}" | docker exec -i "#{container_id}" tar -C "#{dest}" -xf -)
     elsif @has_rsync && sut.check_for_command('rsync')
       # This makes rsync_to work like beaker and scp usually do
       exclude_hack = %(__-__' -L --exclude '__-__)
@@ -376,7 +382,28 @@ module Simp::BeakerHelpers
     # We need to be able to flip between server and client without issue
     on sut, 'puppet resource group puppet gid=52'
     on sut, 'puppet resource user puppet comment="Puppet" gid="52" uid="52" home="/var/lib/puppet" managehome=true'
-    
+
+    # Make sure we have a domain on our host
+    current_domain = fact_on(sut, 'domain').strip
+    hostname = fact_on(sut, 'hostname').strip
+
+    if current_domain.empty?
+      new_fqdn = hostname + '.beaker.test'
+
+      on(sut, "sed -i 's/#{hostname}.*/#{new_fqdn} #{hostname}/' /etc/hosts")
+      on(sut, "echo '#{new_fqdn}' > /etc/hostname", :accept_all_exit_codes => true)
+      on(sut, "hostname #{new_fqdn}", :accept_all_exit_codes => true)
+
+      if sut.file_exist?('/etc/sysconfig/network')
+        on(sut, "sed -s '/HOSTNAME=/d' /etc/sysconfig/network")
+        on(sut, "echo 'HOSTNAME=#{new_fqdn}' >> /etc/sysconfig/network")
+      end
+    end
+
+    if fact_on(sut, 'domain').strip.empty?
+      fail("Error: hosts must have an FQDN, got domain='#{current_domain}'")
+    end
+
     # This may not exist in docker so just skip the whole thing
     if sut.file_exist?('/etc/ssh')
       # SIMP uses a central ssh key location so we prep that spot in case we
@@ -409,7 +436,7 @@ module Simp::BeakerHelpers
         on(sut, %{if [ -f "#{src_file}" ]; then cp -a -f "#{src_file}" "#{tgt_file}" && chmod 644 "#{tgt_file}"; fi}, :silent => true)
       end
     end
-    
+
     # SIMP uses structured facts, therefore stringify_facts must be disabled
     unless ENV['BEAKER_stringify_facts'] == 'yes'
       on sut, 'puppet config set stringify_facts false'

data/lib/simp/beaker_helpers/inspec.rb

@@ -64,7 +64,14 @@ module Simp::BeakerHelpers
       begin
         Dir.chdir(tmpdir) do
           if @sut[:hypervisor] == 'docker'
-            %x(docker cp "#{@sut.host_hash[:docker_container].id}:#{sut_inspec_results}" .)
+            # Work around for breaking changes in beaker-docker
+            if @sut.host_hash[:docker_container]
+              container_id = @sut.host_hash[:docker_container].id
+            else
+              container_id = @sut.host_hash[:docker_container_id]
+            end
+
+            %x(docker cp "#{container_id}:#{sut_inspec_results}" .)
           else
             scp_from(@sut, sut_inspec_results, '.')
           end

data/lib/simp/beaker_helpers/ssg.rb

@@ -277,6 +277,15 @@ module Simp::BeakerHelpers
         else
           on(@sut, %(cd scap-content; git checkout $(git describe --abbrev=0 --tags)))
         end
+
+        # Work around the issue where the profiles now strip out derivative
+        # content that isn't explicitlly approved for that OS. This means that
+        # we are unable to test CentOS builds against the STIG, etc...
+        #
+        # This isn't 100% correct but it's "good enough" for an automated CI
+        # environment to tell us if something is critically out of alignment.
+        on(@sut, %(cd scap-content/build-scripts; sed -i 's/ssg.build_derivatives.profile_handling/#ssg.build_derivatives.profile_handling/g' enable_derivatives.py))
+
         on(@sut, %(cd scap-content/build; cmake ../; make -j4 #{OS_INFO[@os][@os_rel]['ssg']['build_target']}-content && cp *ds.xml #{@scap_working_dir}))
       end
     end

data/lib/simp/beaker_helpers/version.rb

@@ -1,5 +1,5 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.13.0'
+  VERSION = '1.13.1'
 end

data/simp-beaker-helpers.gemspec

@@ -31,11 +31,6 @@ Gem::Specification.new do |s|
   # TODO: Update this when we no longer support Ruby 2.1.9 (should be October 2018)
   s.add_runtime_dependency 'net-telnet', '~> 0.1.1'
 
-  # Because net-telnet dropped support for Ruby < 2.2.0
-  # TODO: Update this when we no longer support Ruby 2.1.9 (should be October 2018)
-  s.add_runtime_dependency 'rubocop', '~> 0.57.2'
-
-
   ### s.files = Dir['Rakefile', '{bin,lib,spec}/**/*', 'README*', 'LICENSE*'] & `git ls-files -z .`.split("\0")
   s.files       = `git ls-files`.split("\n")
   s.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.13.1
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-15 00:00:00.000000000 Z
+date: 2019-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker
@@ -137,20 +137,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.1
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.57.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.57.2
 description: "    Beaker helper methods to help scaffold SIMP acceptance tests\n"
 email: simp@simp-project.org
 executables: []