simp-beaker-helpers 1.10.7 → 1.10.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32a8dc49acbd2983aba94a4ba0807a14c38067db0919405ea998fb2a60fe68c0
-  data.tar.gz: 8c85f102e7dc4dce934303d76885b4cfed21c42cf47cdbbc843497b377477d23
+  metadata.gz: 203f131bf48ef1e75d99c5e856f454abb1eeff54934caae0e776ba3c0e6ad5d5
+  data.tar.gz: 9494a7808631eeb917fa7c898621aa6c4e1e761c719cf9738dd340107c03529c
 SHA512:
-  metadata.gz: 92206a3fd881f98bcd574189c3090459048bfb0c813b08381f7ceeb65d0def201d963616eb08df4ebfa080309bdffd65e8c5a9d010a9f0764ccc3ea8a50f6f14
-  data.tar.gz: 615c5b9a61816772adc6cf6503be7db15ae71ae629fd7f7e4ca63db3e7b10948b983da44260faa8604d7ee8a980cfa3abc95f4d9d6d799f1dc5e89a1d344e4a1
+  metadata.gz: 78fd7c23dec2661905180b85f5bcb3342be28216285519108ee12a43b0812424b57969252dcc8837b11f2825e33dfecce9fb89a2b6c46de3d910be60c11f8584
+  data.tar.gz: c7dd37b296aeaafc44004cb6621b22a36c92e4b601ea619a926a203fb302f3000d45188d9fa106a4cf726bb144873616d309129b3b103a9c30d95fb9d5c7cb0a

data/.gitlab-ci.yml

@@ -0,0 +1,124 @@
+---
+#=======================================================================
+# Global stuff
+stages:
+  - sanity
+  - unit
+  - lint
+  - acceptance
+
+# Default versions are set only as fallbacks for jobs that don't care which
+# version they use.  Versions should be explicitly set in any job with specific
+# version requirements, even if they match these defaults.
+image: 'ruby:2.1'
+
+cache:
+  key: '${CI_COMMIT_REF_SLUG}'
+  paths:
+    - 'vendor/ruby'
+
+before_script:
+  - 'ruby -v'
+  - 'apt update && apt install -y rpm'
+  - 'bundle -v || gem install bundler'
+  - 'bundle config --local path vendor'
+  - 'rm -f Gemfile.lock'
+  - 'bundle install -j $(nproc) --no-binstubs'
+
+#=======================================================================
+# Anchors
+
+.acceptance_base: &acceptance_base
+  stage: 'acceptance'
+  tags: ['beaker']
+  cache:
+    policy: 'pull'
+  dependencies: []
+  artifacts:
+    when: 'always'
+    paths:
+      - 'Gemfile.lock'
+  retry: 1
+  script:
+    - 'bundle exec rake beaker:suites'
+
+# ----------------------------------------------------------------------
+# Version Matrix
+#
+# It would be too expensive, both in time and compute resources, to test
+# against every last version combination, so we restrict it to this subset.
+# Version sets are selected based on current support policies for major platform
+# software, such as Puppet and Ruby.  Namely, we use the version combinations
+# bundled in Puppet Enterprise.
+#
+# For more information see:
+#  * https://puppet.com/docs/pe/latest/overview/component_versions_in_recent_pe_releases.html
+#  * https://puppet.com/misc/puppet-enterprise-lifecycle
+#  * https://puppet.com/docs/pe/latest/overview/getting_support_for_pe.html#standard-releases-and-long-term-support-releases
+#
+# ----------------------------------------------
+# | Release | Puppet | Ruby | End-of-Life Date |
+# ----------|--------|------|------------------|
+# PE 2016.4   4.7      2.1    2018-10
+# PE 2016.5   4.8      2.1    2017-05
+# SIMP 6.0    4.8      2.1    TBD
+# PE 2017.1   4.9      2.1    2017-10
+# PE 2017.2   4.10     2.1    2018-02
+# PE 2017.3   5.3      2.4    2018-08
+# PE 2018.1   5.5      2.4    2020-05
+#
+
+.simp_6_1: &simp_6_1
+  variables:
+    PUPPET_VERSION: '~> 4.10.4'
+
+#=======================================================================
+# Basic Sanity Checks
+#
+# Execute simple sanity checks on the environment before proceeding to more
+# resource-intensive jobs.  Besides running checks, this condenses the initial
+# cache generation into a single job for the later stages.  The first stage,
+# in particular, would otherwise suffer a heavy cache-miss penalty as its
+# jobs kick off in parallel.
+sanity_checks:
+  stage: 'sanity'
+  tags: ['docker']
+  script:
+    - 'bundle exec rake check:dot_underscore'
+    - 'bundle exec rake check:test_file'
+
+tag_check:
+  stage: 'sanity'
+  only: ['tags']
+  tags: ['docker']
+  script: '[ "$CI_COMMIT_TAG" = "$MODULE_VERSION" ] || echo "ERROR: Tag does not match metadata version" && exit 1'
+
+#=======================================================================
+# Unit Tests
+#
+unit:
+  stage: 'unit'
+  image: 'ruby:2.1.9'
+  tags: ['docker']
+  script:
+    - 'bundle exec rake spec'
+  cache:
+    policy: 'pull'
+  dependencies: []
+  artifacts:
+    when: 'always'
+    paths:
+      - 'Gemfile.lock'
+
+# ==============================================================================
+# acceptance tests
+#
+el-simp_6_1-default:
+  <<: *acceptance_base
+  <<: *simp_6_1
+
+el-simp_6_1-default-fips:
+  <<: *acceptance_base
+  <<: *simp_6_1
+  variables:
+    BEAKER_fips: 'yes'

data/.travis.yml

@@ -9,13 +9,11 @@ notifications:
   email: false
 rvm:
   - 2.1.9
-  - 2.3.3
+  - 2.4.2
 env:
   - SIMP_SKIP_NON_SIMPOS_TESTS=1
 script:
   - bundle exec rake spec
-matrix:
-  fast_finish: true
 before_deploy:
   - bundle exec rake clobber
   - "export GEM_VERSION=`ruby -r ./lib/simp/beaker_helpers/version.rb -e 'puts Simp::BeakerHelpers::VERSION'`"
@@ -28,12 +26,12 @@ deploy:
       secure: "AlnBx0dBSxn+S97n0h14ltKUOA+6v0bc7QZPIcwGJV9nnf1hKH3pf9La1TVknEx7XgpAcM9jusQJ7hBlqvSq8z8SFF0bZk1EgSRIKc1cuYPLiGyUM2O7+AFHyCy3iCnPvKeoQmE/BJb5O1dGnbmSbf4A0fqLxA7jiHG1j7z+cnmJB1i67wovDfl13TsOXyBfbespWBMMc0BKAw56FPs9XggAk2cNusS3hd5tqW1AZPT2/xwt+d8ngkmO96u8QcichYRFQ+w+XW4H0w935wNg/dWiskJlt7TIYVAh4Ko5s2DZKf52Tne8TugALSn0LhRatpp7sw1FTTpteCW8UqK8uwGC2hM4pZViAOv4P1YObz2IPOZPriBl+cCayJdMKnotkUJliAMnw5TLiSWKLou+S0Pdj2h3fJZWdOEwRPMzIVoJtsOHG3GdNcPL6f7iU0vP/wr6FeR3uWa+fA7NHRi2Du955O8JpogjdrW08ahcAEwhtI3A4mrA08wN09axsrwr093uDRm/5h4FHyAhExJ0YiA/6kcPpUvILcLStyHe0RQDICQMdsQo2DSbnL65w3QjFa2fML2Shf9cRwX06+ia2BxozWzFD/6p3RiRtPxphnbFiUdjYSGWcwCcUgbJx9SW04lSSxOhpyItuXgxZqiybkzstXd6riu5zwg1R8TWk34="
     on:
       tags: true
-      rvm: 2.1.9
+      rvm: 2.4.2
       condition: "($SKIP_PUBLISH != true)"
   - provider: releases
     api_key:
       secure: "RoQepMSpEzpTLgSYP1apB8AcKNMoumqe/emNg9lIu4T55t7fCPVZFmoTL2/VCjpGpBY3SL6PijSRelY6B1bri+6SFz/hlWhCQ8t1hodrEX23ieFBwWyLI7TFvrCjVejkJwaj7N2nYUQBv8YxScbRp4daFaDhrPJMrfqKZUlBBQ2KEUvqienOn7Tdt4OQ7/ThRXlhBm8OGjZfaKyWDyJykef+yC1scJrl8HA71XRHxho/iojTRPqJJCKW1QNmomVWAwK6ZEvb2WrD27yZN60wEcygdbmzKxlAXrfp13Ho+ir2GjRXJr1VKNPecFTDe21fDFMLZ5VxZgOJ7TWnhz2UAQIPjDTLzEMuJci7DDvRCWMJ17pYurm0OGAeKPWZbtf5PLYouKvnjNsfY8vy+Ip6MqmhiXqqLSO9XN/jgEVFPHj8pOj0DDq6PtTB8dNJj7g60Ak0Uj5iole4/ef1DHv803/t9J6IVqULmYZREqeTg24KkZLfTSEbkhYMGjbCZGaSAGhAFLAAjEDTM19/k50TXnNt5smn31Mqt45PULcrHP4+t6hM+IsX9w05aOlcvfwWiBm9nPlBPeRn59wZ64+T729i5wgkhFcHmYE/2Ql1Hvz5FebyxJQziyw6eRvCVASTtFEkuT+Noy3v4u3G4fQl/S2OeCP4v6Fs0wlImzFE1lA="
     on:
       tags: true
-      rvm: 2.1.9
+      rvm: 2.4.2
       condition: "($SKIP_PUBLISH != true)"

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 1.10.8 / 2018-05-18
+* New env var BEAKER_no_fix_interfaces, set to skip the fix that brings up all
+  vagrant interfaces
+* Parallelized pre-test setup actions that are used across all hosts using `block_on`
+* Add runtime dependency on `highline` for the `inspec` reporting
+
 ### 1.10.7 / 2018-05-11
 * Updated README
 * Changed acceptance tests to use `beaker:suites`

data/README.md

@@ -343,6 +343,10 @@ this will _not_ update modules that are already present under
 #### `BEAKER_stringify_facts`
 #### `BEAKER_use_fixtures_dir_for_modules`
 
+#### `BEAKER_no_fix_interfaces`
+
+Set to skip code that makes sure all interfaces are up
+
 #### PUPPET_VERSION
 
 The `PUPPET_VERSION` environment variable will install the latest

data/lib/simp/beaker_helpers.rb

@@ -165,7 +165,7 @@ module Simp::BeakerHelpers
     opts[:pluginsync] = opts.fetch(:pluginsync, true)
 
     unless ENV['BEAKER_copy_fixtures'] == 'no'
-      Array(suts).each do |sut|
+      block_on(suts, :run_in_parallel => true) do |sut|
         STDERR.puts "  ** copy_fixture_modules_to: '#{sut}'" if ENV['BEAKER_helpers_verbose']
 
         # Use spec_prep to provide modules (this supports isolated networks)
@@ -214,7 +214,7 @@ module Simp::BeakerHelpers
   def enable_fips_mode_on( suts = hosts )
     puts '== configuring FIPS mode on SUTs'
     puts '  -- (use BEAKER_fips=no to disable)'
-    suts.each do |sut|
+    block_on(suts, :run_in_parallel => true) do |sut|
       puts "  -- enabling FIPS on '#{sut}'"
 
       # We need to use FIPS compliant algorithms and keylengths as per the FIPS
@@ -327,7 +327,7 @@ DEFAULT_KERNEL_TITLE=`/sbin/grubby --info=\\\${DEFAULT_KERNEL_INFO} | grep -m1 t
       :timeout
     ]
 
-    Array(suts).each do |sut|
+    block_on(suts, :run_in_parallel => true) do |sut|
       if sut['yum_repos']
         sut['yum_repos'].each_pair do |repo, metadata|
           repo_manifest = %(yumrepo { #{repo}:)
@@ -363,7 +363,7 @@ DEFAULT_KERNEL_TITLE=`/sbin/grubby --info=\\\${DEFAULT_KERNEL_INFO} | grep -m1 t
   # Apply known OS fixes we need to run Beaker on each SUT
   def fix_errata_on( suts = hosts )
 
-    suts.each do |sut|
+    block_on(suts, :run_in_parallel => true) do |sut|
       # 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'
@@ -430,7 +430,7 @@ DEFAULT_KERNEL_TITLE=`/sbin/grubby --info=\\\${DEFAULT_KERNEL_INFO} | grep -m1 t
       host_entry = { fqdn => [] }
 
       # Ensure that all interfaces are active prior to collecting data
-      activate_interfaces(host)
+      activate_interfaces(host) unless ENV['BEAKER_no_fix_interfaces']
 
       # Gather the IP Addresses for the host to embed in the cert
       interfaces = fact_on(host, 'interfaces').strip.split(',')
@@ -556,8 +556,10 @@ done
   #
   # Can be passed any number of hosts either singly or as an Array
   def activate_interfaces(hosts)
-    Array(hosts).each do |host|
-      interfaces = fact_on(host, 'interfaces').strip.split(',')
+    block_on(hosts, :run_in_parallel => true) do |host|
+      interfaces_fact = retry_on(host,'facter interfaces', verbose: true).stdout
+
+      interfaces = interfaces_fact.strip.split(',')
       interfaces.delete_if { |x| x =~ /^lo/ }
 
       interfaces.each do |iface|
@@ -585,7 +587,7 @@ done
     # We can't guarantee that the upstream vendor isn't disabling interfaces so
     # we need to turn them on at each context run
     c.before(:context) do
-      activate_interfaces(hosts)
+      activate_interfaces(hosts) unless ENV['BEAKER_no_fix_interfaces']
     end
 
     c.after(:all) do
@@ -680,7 +682,7 @@ done
           noop    => false
         }
     PLUGINSYNC_MANIFEST
-    apply_manifest_on(hosts, pluginsync_manifest)
+    apply_manifest_on(hosts, pluginsync_manifest, :run_in_parallel => true)
   end
 
 

data/lib/simp/beaker_helpers/version.rb

@@ -1,5 +1,5 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.10.7'
+  VERSION = '1.10.8'
 end

data/simp-beaker-helpers.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'beaker', '~> 3.14'
   s.add_runtime_dependency 'beaker-puppet', '~> 0.8.0'
   s.add_runtime_dependency 'beaker-puppet_install_helper', '~> 0.6'
+  s.add_runtime_dependency 'highline', '~> 1.6'
 
   ### s.files = Dir['Rakefile', '{bin,lib,spec}/**/*', 'README*', 'LICENSE*'] & `git ls-files -z .`.split("\0")
   s.files       = `git ls-files`.split("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.10.7
+  version: 1.10.8
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-15 00:00:00.000000000 Z
+date: 2018-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker
@@ -53,6 +53,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
 description: |2
       Beaker helper methods to help scaffold SIMP acceptance tests
 email: simp@simp-project.org
@@ -62,6 +76,7 @@ extra_rdoc_files: []
 files:
 - ".fixtures.yml"
 - ".gitignore"
+- ".gitlab-ci.yml"
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
@@ -116,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: beaker helper methods for SIMP