simp-beaker-helpers 1.25.0 → 1.26.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bce7304da1a7425de25af167725291b8889ca26e1bbbed5559b0583fb900a1b4
-  data.tar.gz: 359b9c5c9eda2855e7eab95f1afc7837f3fbc108ccef4aaf2eb6d2b0d9f7858f
+  metadata.gz: b361d19ffb83f7ce149363e948e0e9580d6c85c378638bbaff77d6252d36f1e1
+  data.tar.gz: edaf5e05b246e96ea81e33c588c9c3d71d7e1f610ef5f782e0d02be6dc2c5816
 SHA512:
-  metadata.gz: 9ea99cff5b4a6e7e0f7fe1720efe7e439215ea14cbc0f278fe7a0f314470a3026fe64717d55559e1c80945ac4cb28289f25344b5e5e7a978516d11029b1f1add
-  data.tar.gz: 336a178662a391759629d6d539aaf78b3ecb7d7fc93804e49e63bf03057cb87a6d9f996298c8a203a31e4aec4ee299df8dd49ba68e950df216769553edf4d2f7
+  metadata.gz: 63232d87cc0b63deef62fbb61964aa0cd2a60935ea5a2746c76cecf2d261601c89b8703e36325052c9243bdee4f023e2591b7dcc8b8354b13cbe0f03c3881d4c
+  data.tar.gz: c2019a1a3aa4fc7b2b4d10e00e1fd87318926c55e9e3572892d24f2b314c37bbdbba7f56ac8fdf20948cf1674a133cf85c82d3366372d8460114ed1e83f7ab0f

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+### 1.26.1 / 2022-06-24
+* Fixed:
+  * Ensure that `multi_node` is enabled by default for backwards compatibility
+  * Sort the discovered nodesets by default when running with `ALL` nodesets
+
+### 1.26.0 / 2022-06-24
+* Added:
+  * Allow for sequential nodesets by setting `multi_node: false` in the
+    `CONFIG:` section of your nodeset.
+
 ### 1.25.0 / 2022-06-11
 * Fixed:
   * Replaced calls to `sed -c` with something POSIX compliant that should work

data/lib/simp/beaker_helpers/version.rb

@@ -1,5 +1,5 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.25.0'
+  VERSION = '1.26.1'
 end

data/lib/simp/rake/beaker.rb

@@ -225,7 +225,46 @@ module Simp::Rake
               nodesets << File.join(nodeset_path, 'default.yml')
             end
 
+            refined_nodesets = []
+
             nodesets.each do |nodeset_yml|
+              parsed_nodeset = ::Beaker::Options::HostsFileParser.parse_hosts_file(nodeset_yml)
+
+              # Default to multi-node testing for backwards compatibility
+              multi_node = (parsed_nodeset[:multi_node] == false ? false: true)
+
+              if multi_node
+                refined_nodesets.push(nodeset_yml)
+              else
+                parsed_nodeset_hosts = parsed_nodeset.delete(:HOSTS)
+
+                parsed_nodeset_hosts.each do |k,v|
+
+                  v[:roles] ||= []
+                  v[:roles] |= ['default']
+
+                  tmp_nodeset = {
+                    :HOSTS  => { k => v },
+                    :CONFIG => parsed_nodeset
+                  }
+
+                  tmp_nodeset_file = Tempfile.new("nodeset_#{k}-")
+                  tmp_nodeset_file.write(tmp_nodeset.to_yaml)
+                  tmp_nodeset_file.close
+
+                  refined_nodesets.push(tmp_nodeset_file.path)
+
+                  at_exit do
+                    if tmp_nodeset_file && File.exist?(tmp_nodeset_file.path)
+                      tmp_nodeset_file.close
+                      tmp_nodeset_file.unlink
+                    end
+                  end
+                end
+              end
+            end
+
+            refined_nodesets.sort.each do |nodeset_yml|
               unless File.file?(nodeset_yml)
                 # Get here if user has specified a non-existent nodeset or the
                 # implied `default` nodeset does not exist.

data/spec/acceptance/nodesets/amzn2.yml

@@ -8,7 +8,6 @@
 HOSTS:
   amzn2:
     roles:
-      - master
       - default
     platform: el-7-x86_64
     box: gbailey/amzn2

data/spec/acceptance/nodesets/default.yml

@@ -8,8 +8,8 @@
 HOSTS:
   el7:
     roles:
+      - default
       - el7
-      - master
     platform: el-7-x86_64
     box: centos/7
     hypervisor: <%= hypervisor %>
@@ -22,6 +22,7 @@ HOSTS:
     hypervisor: <%= hypervisor %>
 
 CONFIG:
+  multi_node: <%= ['yes','true'].include?(ENV['BEAKER_multi_node']) ? true : false %>
   log_level: verbose
   type: aio
   vagrant_cpus: 2

data/spec/acceptance/nodesets/docker.yml

@@ -1,8 +1,8 @@
 HOSTS:
   el7.test.net:
     roles:
+      - default
       - el7
-      - master
     platform:   el-7-x86_64
     hypervisor: docker
     image: simpproject/simp_beaker_el7

data/spec/acceptance/nodesets/oel.yml

@@ -8,8 +8,8 @@
 HOSTS:
   oel7:
     roles:
+      - default
       - el7
-      - master
     platform: el-7-x86_64
     box: generic/oracle7
     hypervisor: <%= hypervisor %>

data/spec/acceptance/nodesets/ubuntu.yml

@@ -7,6 +7,8 @@
 -%>
 HOSTS:
   focal:
+    roles:
+      - default
     platform: ubuntu-20.04-x86_64
     box: ubuntu/focal64
     hypervisor: <%= hypervisor %>

data/spec/acceptance/suites/default/fixture_modules_spec.rb

@@ -6,41 +6,41 @@ context 'after copy_fixture_modules_to( hosts )' do
     copy_fixture_modules_to( hosts )
   end
 
-  describe "fact_on(master,'root_home')" do
+  describe "fact_on(default,'root_home')" do
     it 'should not return value of `root_home`' do
-      expect(fact_on(master, 'root_home')).to eq ''
+      expect(fact_on(default, 'root_home')).to eq ''
     end
   end
 
-  describe "pfact_on(master,'root_home')" do
+  describe "pfact_on(default,'root_home')" do
     it 'should return value of `root_home`' do
-      expect(pfact_on(master, 'root_home')).to eq '/root'
+      expect(pfact_on(default, 'root_home')).to eq '/root'
     end
   end
 
-  describe "pfact_on(master,'os.release.major')" do
+  describe "pfact_on(default,'os.release.major')" do
     it 'should return the value of `os.release.major`' do
-      expect(pfact_on(master, 'os.release.major')).to match(/.+/)
+      expect(pfact_on(default, 'os.release.major')).to match(/.+/)
     end
   end
 
-  describe "pfact_on(master,'os.release.foo')" do
+  describe "pfact_on(default,'os.release.foo')" do
     it 'should not return the value of `os.release.foo`' do
-      expect(pfact_on(master, 'os.release.foo')).to eq ''
+      expect(pfact_on(default, 'os.release.foo')).to eq ''
     end
   end
 
-  describe "pfact_on(master,'fips_enabled')" do
+  describe "pfact_on(default,'fips_enabled')" do
     expected = (ENV['BEAKER_fips'] == 'yes')
 
     it 'should return false' do
-      expect(pfact_on(master, 'fips_enabled')).to eq expected
+      expect(pfact_on(default, 'fips_enabled')).to eq expected
     end
   end
 
   describe "pfact_on returns a hash" do
     it 'should return a Hash' do
-      expect(pfact_on(master, 'os')).to be_a(Hash)
+      expect(pfact_on(default, 'os')).to be_a(Hash)
     end
   end
 end

data/spec/acceptance/suites/default/pki_tests_spec.rb

@@ -4,21 +4,21 @@ require 'tmpdir'
 
 context 'PKI operations' do
 
-  context 'after run_fake_pki_ca_on(master,hosts)' do
+  context 'after run_fake_pki_ca_on(default,hosts)' do
     before(:all) do
       copy_fixture_modules_to( hosts )
     end
 
     shared_examples_for 'a correctly copied keydist/ tree' do |test_dir|
       it 'correctly copies keydist/ tree' do
-        on(master, "ls -d #{test_dir}" +
+        on(default, "ls -d #{test_dir}" +
                    " #{test_dir}/cacerts" +
                    " #{test_dir}/cacerts/cacert_*.pem"
           )
 
         hosts.each do |host|
           name = host.node_name
-          on(master, "ls -d #{test_dir}/#{name}/cacerts" +
+          on(default, "ls -d #{test_dir}/#{name}/cacerts" +
                      " #{test_dir}/#{name}/#{name}.pem"  +
                      " #{test_dir}/#{name}/#{name}.pub"  +
                      " #{test_dir}/cacerts/cacert_*.pem"
@@ -29,10 +29,10 @@ context 'PKI operations' do
 
     describe 'a Fake CA under /root' do
       tmp_keydist_dir = Dir.mktmpdir 'simp-beaker-helpers__pki-tests'
-      run_fake_pki_ca_on( master, hosts, tmp_keydist_dir  )
+      run_fake_pki_ca_on( default, hosts, tmp_keydist_dir  )
 
       it 'should create /root/pki' do
-        on(master, 'test -d /root/pki')
+        on(default, 'test -d /root/pki')
       end
 
       it_behaves_like 'a correctly copied keydist/ tree', '/root/pki/keydist'
@@ -41,13 +41,13 @@ context 'PKI operations' do
 
     describe 'after copy_keydist_to' do
       test_dir = '/etc/puppetlabs/code/environments/production/modules/pki/files/keydist'
-      copy_keydist_to(master)
+      copy_keydist_to(default)
       it_behaves_like 'a correctly copied keydist/ tree', test_dir
     end
 
-    describe 'after copy_keydist_to(master,"/tmp/foo")' do
+    describe 'after copy_keydist_to(default,"/tmp/foo")' do
       test_dir = '/tmp/foo'
-      copy_keydist_to(master, test_dir)
+      copy_keydist_to(default, test_dir)
       it_behaves_like 'a correctly copied keydist/ tree', test_dir
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.25.0
+  version: 1.26.1
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-17 00:00:00.000000000 Z
+date: 2022-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker