kitchen-salt 0.0.12 → 0.0.13

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmZkNDMxMWY5NGZmMWYzZTUxNDc3ZmJiYjk3NzJkYjUxMWYzNzI3Ng==
+    MTJlNTRiYmI5MmNjMTc4MGFlYjkwMmFlMTQ0ZDg4NWRiZmZhZDczZg==
   data.tar.gz: !binary |-
-    MDM0NDFiOWIxMDgyODgwNTAyMmJkMzhmZTNiZjkzNDJmMTE5NGJkYw==
+    NDc5MGJkNjczOGMzYjFlMWRkMDhiMDk4MWRiN2UyMjJhNzk0NjY0Ng==
 SHA512:
   metadata.gz: !binary |-
-    YzJiOGM1MmM5MTI1MmJiZTg5MjgwMjI2YTE5NDhkZWFjMTgwYWU1YmY4ODFk
-    YTQ4NWFmMjg2YmU4OWVjYTg0MzhhYWYxNzFhYWZjZmUyMGUwYzRkYTkxMzBh
-    MzRhNWI4NTA0MTAxMGNiM2ViMzFhNjIzYThlNzY4NzIwMGIxMjY=
+    M2E2YmFlZTg0NDZiZjUyZGQzOWMyZGM1ODJiOTRjNjNhYjQyMzdkYzNkNDI4
+    YmMzOTM5Y2Y2ZDczZTRjNzEyM2JiMjU0NmUwNTkxYzEzM2E4YzE1YjZmZmU4
+    Zjk4NjlhNmQ4YTQwOTlhZDgxMWRkODJiMWExNDg1Y2YyMDFiMGY=
   data.tar.gz: !binary |-
-    MzI3NmEzZTA3MDcxZWU1NWIyMjQwMWZiNjQ3ODY2ODk5NTkxNDMwYzNiOGIw
-    NzE2N2Q2NjM4NjI4YzkxOTY0ZGE1M2E4YjNkMjVjNjcwZjAyN2MxZjkwMjkw
-    NjkyOGUzNWM0MTU0ZGU3Mjg4MmZiNTliYWNlYjk2NDk5Y2RhNjk=
+    NTg4ZWJkYTAwN2IwYTljZTNlOGE1Yjk1ZjcwMzE3MDlkODJlYTMxMGFkOWYy
+    NDkwYzg3Zjc5MjNkY2YwYmY0MmM5MjljNzM5NTU4NWM5ZDcwM2FiMGE1ZTA0
+    OGUzOTk2NDQ4NmZjMjhhYTJhMmY0MWUyNGRkMmVhZTUzNTNmNDU=

data/lib/kitchen-salt/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Salt
-    VERSION = "0.0.12"
+    VERSION = "0.0.13"
   end
 end

data/lib/kitchen/provisioner/salt_solo.rb

@@ -53,7 +53,7 @@ module Kitchen
       default_config :salt_run_highstate, true
 
       # salt-call version that supports the undocumented --retcode-passthrough command
-      RETCODE_VERSION = '0.17.5'
+      RETCODE_VERSION = '2014.2.0'
 
       def install_command
         debug(diagnose())
@@ -167,12 +167,17 @@ module Kitchen
 
         cmd << " --log-level=#{config[:log_level]}"
 
-        # config[:salt_version] can be 'latest' or 'x.y.z'
-        if config[:salt_version] >= RETCODE_VERSION
+        # config[:salt_version] can be 'latest' or 'x.y.z', 'YYYY.M.x' etc
+        # error return codes are a mess in salt:
+        #  https://github.com/saltstack/salt/pull/11337
+        # Unless we know we have a version that supports --retcode-passthrough
+        # attempt to scan the output for signs of failure
+        if config[:salt_version] > RETCODE_VERSION && config[:salt_version] != 'latest'
+          # hope for the best and hope it works eventually
           cmd = cmd + " --retcode-passthrough"
         else
-          # grep the output for ERROR or CRITICAL & return a 1 on finding a problem
-          fail_grep = 'grep -e ERROR -e CRITICAL'
+          # scan the output for signs of failure, there is a risk of false negatives
+          fail_grep = 'grep Result.*False'
           cmd << " 2>&1 | tee /tmp/salt-call-output ; (sed '/#{fail_grep}/d' /tmp/salt-call-output | #{fail_grep} ; EC=$? ; [ ${EC} -eq 0 ] && exit 1 ; [ ${EC} -eq 1 ] && exit 0)"
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-salt
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Simon McCartney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-03-27 00:00:00.000000000 Z
 dependencies: []
 description: salt provisioner for test-kitchen
 email: