commit e98ce684363b12df505bb029c32551b9ab565af5
author Jakub Josef <jakub.josef@gmail.com> Thu Jun 01 15:44:25 2017 +0200
committer Jakub Josef <jjosef@mirantis.com> Thu Jun 01 13:45:30 2017 +0000
tree d83ff9856f1b08391b0a1223204e6ce8495058e3
parent 47d1f23ba77f88524aaa0d96f249ddb6dfbc8602

Added support for external kitchen suite definition

Change-Id: I984389a5d63501d5a7f4d0e75cc7a01c34280c6e

src/com/mirantis/mk/Ruby.groovy

diff --git a/src/com/mirantis/mk/Ruby.groovy b/src/com/mirantis/mk/Ruby.groovy
index 3508ae6..2357f59 100644
--- a/src/com/mirantis/mk/Ruby.groovy
+++ b/src/com/mirantis/mk/Ruby.groovy
@@ -43,7 +43,7 @@
  */
 def runKitchenTests(environment="", parallelTesting = true){
     def common = new com.mirantis.mk.Common()
-    def kitchenTests=runKitchenCommand("list -b", environment)
+    def kitchenTests=runKitchenCommand("list -b 2>/dev/null \"\$SUITE\"", environment)
     if(kitchenTests && kitchenTests != ""){
         def kitchenTestsList = kitchenTests.trim().tokenize("\n")
         def kitchenTestRuns = [:]
@@ -52,7 +52,9 @@
             def testSuite = kitchenTestsList[i]
             kitchenTestRuns["kitchen-${testSuite}-${i}"] = {
                 common.infoMsg("Running kitchen test ${testSuite}")
-                println(runKitchenCommand("converge " + testSuite, environment))
+                println(runKitchenCommand("converge ${testSuite}", environment))
+                println runKitchenCommand("verify ${testSuite} -t tests/integration", environment)
+                println runKitchenCommand("destroy", environment)
             }
         }
         if(parallelTesting){
@@ -60,8 +62,6 @@
         }else{
             common.serial(kitchenTestRuns)
         }
-        println runKitchenCommand("verify -t tests/integration", environment)
-        println runKitchenCommand("destroy", environment)
     }else{
         common.errorMsg("Cannot found kitchen test suites, kitchen list command returns bad output")
     }