commit 8ed284e6328db9bcfeffd432adb9d4197cb05b38
author Jakub Josef <jakub.josef@gmail.com> Mon May 22 15:22:15 2017 +0200
committer Jakub Josef <jjosef@mirantis.com> Mon May 22 13:22:37 2017 +0000
tree 888fb9b242b7a3bf540823dba82271155f93b141
parent c9b3cc8e4b58c297fc2deae44956f47b5dc2799d

Fix null passing in kitchen tests

Change-Id: I318e4ddd393fbfbb1cbe8f3b5abbbbc2d7263c73

src/com/mirantis/mk/Ruby.groovy

diff --git a/src/com/mirantis/mk/Ruby.groovy b/src/com/mirantis/mk/Ruby.groovy
index d53af4b..31876c3 100644
--- a/src/com/mirantis/mk/Ruby.groovy
+++ b/src/com/mirantis/mk/Ruby.groovy
@@ -19,8 +19,8 @@
  * Install kitchen tools
  */
 def installKitchen(){
-    sh """rbenv exec gem install bundler;
-          rbenv exec gem install test-kitchen;"""
+    sh """rbenv exec gem install bundler --conservative;
+          rbenv exec gem install test-kitchen --conservative;"""
     sh """  test -e Gemfile || cat <<EOF > Gemfile
             source 'https://rubygems.org'
             gem 'rake'
@@ -42,8 +42,9 @@
         def kitchenTestsList = kitchenTests.trim().tokenize("\n")
         def kitchenTestRuns = [:]
         for(int i=0;i<kitchenTestsList.size();i++){
-            kitchenTestRuns["kitchen-run-${i}"]= {
-                runKitchenCommand("converge ${kitchenTestsList[i]}", environment)
+            def testSuite = kitchenTestsList[i]
+            kitchenTestRuns["kitchen-${testSuite}-${i}"] = {
+                runKitchenCommand("converge " + testSuite, environment)
             }
         }
         parallel kitchenTestRuns