simp-beaker-helpers 1.0.11 → 1.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTBhZjRkNWY5MGMxNmE4ZTRkNDI2YmQyYThmNTU3NWY1Y2U5ZDM5Yg==
+    OTk4ZmEwOTk2ODBkMDc5MDUwYThhNDE1OTZlNDllNDUxYWFjY2U4Zg==
   data.tar.gz: !binary |-
-    MDc0YmJlOTZkYjZkNWJjNmUxNWRjNmE1YTEyNjUzOTEyMWU2MTg0Nw==
+    NmE3ZGZkNzg1ZDUxNjkzZjUzYjUzNDdmNTZmZTJkNzFhYTQ4OTc4Yw==
 SHA512:
   metadata.gz: !binary |-
-    NTA1YjIyMTA2ZmRlMDQ5ZDMyZGFmNWRiMTdmZWQwZGJjZmZkYzQ5MWI5MWYw
-    NWRkMzNmOTVkNTMwOTJlMDg4NjUxMDNlNGYwYjNiOGYyNWQ4NDEyYWViZDNh
-    NDA5N2RiM2UxODQwN2U5MDE5NzA3OGQzOGEzNWE3Y2I2OWYxODU=
+    N2IzYTU4NDlhOTBmZmEzZDZjYTQ5YjkxNDNiNWJmYjIzOWMxNjJkMGFmMTBj
+    ODhkOTc1ZDk2NzdkZTNlMDllNmE4MmYyMDFlZTY0Njc1NjhiNWExNDcyMzg5
+    MzFlNjllMjZlMzc5ZmU4MDA2Mjg0NjgzMjk0ZWQ3ZWI4M2IzNDQ=
   data.tar.gz: !binary |-
-    ZjI5MmE3YTc4MDAzMGEwMjYzOGQxMjBhMTAzOTJjZWEyMzcyMGIxOWQwNjk4
-    ZTM4YTU2NGM0MTRjYmViMzk0M2RlN2Q1YjY2ZDAwMWQyZGQxMmRkOThjZjRi
-    Yjk5YjUwNjYyZDRhNDFkZjk2ZGVhNTM5OWYzYzhlZDY1MTk0ZDI=
+    ZjhkN2QwZTNiNjFhNDZlOGJhYmVkMzFmMThjNGZkNDcxOTJlNjUyNGYzYzhk
+    MjE4NTdhODc5MmM0Y2EzMDU1MmRlMmVlMzNkZTdjY2NiODFiMGIyZGQ3N2Zi
+    MTQyOGE1ZGQ3ODc5MjM1YmU5ZDcxNzRjOTFlYmJiNGQ5ZmU4NmY=

data/README.md

@@ -6,7 +6,9 @@ Methods to assist beaker acceptance tests for SIMP.
 1. [Overview](#overview)
 2. [Setup](#setup)
     * [Beginning with simp-beaker-helpers](#beginning-with-simp-beaker-helpers)
-3. [Methods](#methods)
+3. [Nodeset Enhancements](#nodeset-enhancements)
+    * [YUM Repo Support](#yum_repo_support)
+4. [Methods](#methods)
     * [`copy_fixture_modules_to`](#copy_fixture_modules_to)
     * [`fix_errata_on`](#fix_errata_on)
     * PKI
@@ -19,14 +21,14 @@ Methods to assist beaker acceptance tests for SIMP.
     * Hiera
       * [`set_hieradata_on`](#set_hieradata_on)
       * [`clear_temp_hieradata`](#clear_temp_hieradata)
-4. [Environment variables](#environment-variables)
+5. [Environment variables](#environment-variables)
     * [`BEAKER_fips`](#beaker_fips)
     * [`BEAKER_spec_prep`](#beaker_spec_prep)
     * [`BEAKER_stringify_facts`](#beaker_stringify_facts)
     * [`BEAKER_use_fixtures_dir_for_modules`](#beaker_use_fixtures_dir_for_modules)
-5. [Examples](#examples)
+6. [Examples](#examples)
     * [Prep OS, Generate and copy PKI certs to each SUT](#prep-os-generate-and-copy-pki-certs-to-each-sut)
-6. [License](#license)
+7. [License](#license)
 
 ## Overview
 
@@ -45,6 +47,21 @@ Add this to your project's `spec/spec_helper_acceptance.rb`:
 require 'simp/beaker_helpers'
 include Simp::BeakerHelpers
 ```
+## Nodeset Enhancements
+
+### YUM Repo Support
+
+Nodes in your nodesets will create YUM repository entries according to the
+following Hash:
+
+```yaml
+yum_repos:
+   <repo_name>:
+     url: <URL>
+     gpgkeys:
+       - <URL to GPGKEY1>
+       - <URL to GPGKEY2>
+```
 
 ## Methods
 
@@ -142,13 +159,9 @@ SIMP acceptance tests enable [FIPS mode](https://access.redhat.com/documentation
 **NOTE:** FIPS mode is only enabled on RedHat family hosts
 
 #### `BEAKER_spec_prep`
-#
-
-
 #### `BEAKER_stringify_facts`
 #### `BEAKER_use_fixtures_dir_for_modules`
 
-
 ## Examples
 
 ### Prep OS, Generate and copy PKI certs to each SUT

data/lib/simp/beaker_helpers.rb

@@ -1,7 +1,7 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.0.11'
+  VERSION = '1.2.0'
 
   # use the `puppet fact` face to look up facts on an SUT
   def pfact_on(sut, fact_name)
@@ -155,6 +155,30 @@ DEFAULT_KERNEL_TITLE=`/sbin/grubby --info=\\\${DEFAULT_KERNEL_INFO} | grep -m1 t
   end
 
 
+  # Collect all 'yum_repos' entries from the host nodeset.
+  # The acceptable format is as follows:
+  # yum_repos:
+  #   <repo_name>:
+  #     url: <URL>
+  #     gpgkeys:
+  #       - <URL to GPGKEY1>
+  #       - <URL to GPGKEY2>
+  def enable_yum_repos_on( suts = hosts )
+    Array(suts).each do |sut|
+      if sut['yum_repos']
+        sut['yum_repos'].each_pair do |repo, metadata|
+          repo_manifest = <<-EOS
+            yumrepo { #{repo}:
+              baseurl => '#{metadata[:url]}',
+              gpgkey => '#{metadata[:gpgkeys].join(" ")}'
+            }
+          EOS
+          apply_manifest_on(sut, repo_manifest, :catch_failures => true)
+        end
+      end
+    end
+  end
+
   # Apply known OS fixes we need to run Beaker on each SUT
   def fix_errata_on( suts = hosts )
 
@@ -168,11 +192,13 @@ DEFAULT_KERNEL_TITLE=`/sbin/grubby --info=\\\${DEFAULT_KERNEL_INFO} | grep -m1 t
       # at least have the host defaults:
       #
       # :hieradatadir is used as a canary here; it isn't the only missing key
-      unless sut.host_hash.key? :hieradatadir 
+      unless sut.host_hash.key? :hieradatadir
         configure_type_defaults_on(sut)
       end
 
       if fact_on(sut, 'osfamily') == 'RedHat'
+        enable_yum_repos_on(sut)
+
         # net-tools required for netstat utility being used by be_listening
         if fact_on(sut, 'operatingsystemmajrelease') == '7'
           pp = <<-EOS
@@ -180,17 +206,16 @@ DEFAULT_KERNEL_TITLE=`/sbin/grubby --info=\\\${DEFAULT_KERNEL_INFO} | grep -m1 t
           EOS
           apply_manifest_on(sut, pp, :catch_failures => false)
         end
-      end
 
+        # Clean up YUM prior to starting our test runs.
+        on(sut, 'yum clean all')
+      end
     end
 
     # Configure and reboot SUTs into FIPS mode
     unless ENV['BEAKER_fips'] == 'no'
       enable_fips_mode_on(suts)
     end
-
-    # Clean up YUM prior to starting our test runs.
-    on(suts, 'yum clean all')
   end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.2.0
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-18 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker
@@ -88,4 +88,3 @@ test_files:
 - spec/acceptance/pfacter_spec.rb
 - spec/acceptance/pki_tests_spec.rb
 - spec/spec_helper_acceptance.rb
-has_rdoc: