kitchen-salt 0.0.13 → 0.0.14

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTJlNTRiYmI5MmNjMTc4MGFlYjkwMmFlMTQ0ZDg4NWRiZmZhZDczZg==
+    NDcwOTFlMGJmYmQyNjEzODU5ODU3ZDZlOGE1ZDhkMmM2NDQyNjk2NQ==
   data.tar.gz: !binary |-
-    NDc5MGJkNjczOGMzYjFlMWRkMDhiMDk4MWRiN2UyMjJhNzk0NjY0Ng==
+    ZjNkYzYzMzhlMTg4Mjc1ZmJkMTk0MTU2ZThhZjNiNjU3ODA3NDNiMA==
 SHA512:
   metadata.gz: !binary |-
-    M2E2YmFlZTg0NDZiZjUyZGQzOWMyZGM1ODJiOTRjNjNhYjQyMzdkYzNkNDI4
-    YmMzOTM5Y2Y2ZDczZTRjNzEyM2JiMjU0NmUwNTkxYzEzM2E4YzE1YjZmZmU4
-    Zjk4NjlhNmQ4YTQwOTlhZDgxMWRkODJiMWExNDg1Y2YyMDFiMGY=
+    NDk2ZTQ5ZTUzOWY5NzU2NjBmZDNiYjZjM2NiMzRhODU2Y2M1ZjIzNWNkZGI2
+    NWYzMGY0Yjk1NTkzMjE0NGRkMmU0MGQ1ZTM5NTQ0OWE1YzBhYjViOTgzYmM3
+    MzI0NTMzN2EyOGRhYjk4NDJhMzA2ZjM4MmMxYjJmMmRkZDgxNjE=
   data.tar.gz: !binary |-
-    NTg4ZWJkYTAwN2IwYTljZTNlOGE1Yjk1ZjcwMzE3MDlkODJlYTMxMGFkOWYy
-    NDkwYzg3Zjc5MjNkY2YwYmY0MmM5MjljNzM5NTU4NWM5ZDcwM2FiMGE1ZTA0
-    OGUzOTk2NDQ4NmZjMjhhYTJhMmY0MWUyNGRkMmVhZTUzNTNmNDU=
+    ZWMyOWE1YmMwZTJmM2U4YjU5ZDMyZmFiM2Y1ZWRkOGYxYzg0MTEwZDZiNmE2
+    ZGY4YWYxYTI3NGU4OTVjZTcyMTI3MWQ5NmIwNDIzYmNiMThlNDI4MzRmMDIy
+    MGYzODQ4MjMzMTRlNjAzMDE0ZGU3YWY4ODc4MTI1OTM0MDQwYjE=

data/lib/kitchen-salt/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Salt
-    VERSION = "0.0.13"
+    VERSION = "0.0.14"
   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 = '2014.2.0'
+      RETCODE_VERSION = '0.17.5'
 
       def install_command
         debug(diagnose())
@@ -175,12 +175,20 @@ module Kitchen
         if config[:salt_version] > RETCODE_VERSION && config[:salt_version] != 'latest'
           # hope for the best and hope it works eventually
           cmd = cmd + " --retcode-passthrough"
-        else
-          # 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
 
+        # scan the output for signs of failure, there is a risk of false negatives
+        fail_grep = 'grep -e Result.*False -e Data.failed.to.compile'
+        fail_grep = 'grep -e Result.*False'
+        # capture any non-zero exit codes from the salt-call | tee pipe
+        cmd = 'set -o pipefail ; ' << cmd
+        # Capture the salt-call output & exit code
+        cmd << " 2>&1 | tee /tmp/salt-call-output ; SC=$? ; echo salt-call exit code: $SC ;"
+        # check the salt-call output for fail messages
+        cmd << " (sed '/#{fail_grep}/d' /tmp/salt-call-output | #{fail_grep} ; EC=$? ; echo salt-call output grep exit code ${EC} ;"
+        # use the non-zer exit code from salt-call, then invert the results of the grep for failures
+        cmd << " [ ${SC} -ne 0 ] && exit ${SC} ; [ ${EC} -eq 0 ] && exit 1 ; [ ${EC} -eq 1 ] && exit 0)"
+
         cmd
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-salt
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Simon McCartney