beaker-puppet 0.13.1 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 931bc159fb35093627355861de11e6ba928278c4
-  data.tar.gz: 137329258bd9f8fba9a461cf3a47fb21173dd565
+  metadata.gz: 32ce5196cb45a1b0dbcf67bc6be1dc34470c8f6f
+  data.tar.gz: ceb78a8b6820c970dbe3c76c08b9c57eb9a5fe7a
 SHA512:
-  metadata.gz: 2e3a8c543cc7832b0a965128c34bcbf3ced982afdeb09f30478b3c9f967b3c6d29f4aad52fa09faac97dbb9523a0eed7e6bb0166d0c26914cf3a689d758a81b1
-  data.tar.gz: 01b4ed4e6643c22e4ab17ade0fe9835b793a4c12fad21f72fd5fb2d0de5116a7b975234fece9cfa3184c68df22daab21e3bde8e33eb00a3ce3002f1163358073
+  metadata.gz: 11eb5ca8d2ff0fddcc499e3ebdc966b987ddf944a09ff2483535fdcc53ad0374c39738c877764b2a2a9ffc6b317a0f01b5e29108f6d7f566055df1de37b62e08
+  data.tar.gz: d72ebe97747ff116490368d423590e967e5ecec674b9059c7d58a8bf96c855c044860780e56f3d83ea9f89558e4a4e8074e9cc78b32b149a1fbbdd7b4fb729c8

data/lib/beaker-puppet/helpers/puppet_helpers.rb

@@ -726,13 +726,6 @@ module Beaker
         def stop_agent_on(agent, opts = {})
           block_on agent, opts do | host |
             vardir = host.puppet_configprint['vardir']
-            agent_running = true
-            while agent_running
-              agent_running = host.file_exist?("#{vardir}/state/agent_catalog_run.lock")
-              if agent_running
-                sleep 2
-              end
-            end
 
             # In 4.0 this was changed to just be `puppet`
             agent_service = 'puppet'
@@ -757,6 +750,16 @@ module Beaker
             else
               on host, puppet_resource('service', agent_service, 'ensure=stopped')
             end
+
+            #Ensure that a puppet run that was started before the last lock check is completed
+            agent_running = true
+            while agent_running
+              agent_running = host.file_exist?("#{vardir}/state/agent_catalog_run.lock")
+              if agent_running
+                sleep 2
+              end
+            end
+
           end
         end
 

data/lib/beaker-puppet/version.rb

@@ -1,3 +1,3 @@
 module BeakerPuppet
-  VERSION = '0.13.1'
+  VERSION = '0.13.2'
 end

data/tasks/ci.rake

@@ -73,6 +73,43 @@ MASTER_TEST_TARGET:
     Override the default master test target. Should only be used with
     TEST_TARGET, and is only intended to be used in CI. Defaults to
     #{DEFAULT_MASTER_TEST_TARGET}.
+
+DEV_BUILDS_URL:
+    Override the url where we look for development builds of packages to test.
+    Defaults to https://builds.delivery.puppetlabs.net
+
+NIGHTLY_BUILDS_URL:
+    Override the url where we look for nightly builds of packages to test.
+    Defaults to https://nightlies.puppet.com
+
+RELEASE_STREAM
+    The release stream for the puppet family you want to test. This defaults to 'puppet',
+    which is the current latest release stream. Other options are currently published streams
+    like 'puppet5' or 'puppet6'. This is currently only used when accessing repos on
+    nightlies.puppet.com
+
+SERVER_VERSION:
+    The version of puppetserver to test against. This defaults to 'latest' if unset.
+    When it defaults to latest, it will attept to pull packages from NIGHTLY_BUILDS_URL
+    from the RELEASE_STREAM repo.
+
+FORK:
+    Used to build a github url. If unset, this defaults to 'puppetlabs'. This can be used to
+    point acceptance to pull a repo to test from a personal fork.
+
+$project_FORK:
+    Similar to FORK, but project specific. If you have only one project (i.e., hiera) that you
+    wanted to test from a different fork then all the others, you could set HIERA_FORK=melissa,
+    you would get back 'https://github.com/melissa/hiera.git'.
+
+SERVER:
+    Used to build a github url. If unset, this defaults to 'github.com'. This can be used to
+    pull a github repo from a unique server location.
+
+$project_SERVER:
+    Similar to SERVER, but project specific. If you have only one project (i.e., hiera) that you
+    want to pull from a different server then all the others, you could set HIERA_SERVER=179.0.0.1,
+    and you would get back 'https://179.0.0.1/puppetlabs-hiera.git'.
 EOS
 
 namespace :ci do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.2
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-09 00:00:00.000000000 Z
+date: 2018-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec