commit e78592957de191687c0310464b65159058b3b26a
author Tomáš Kukrál <tkukral@mirantis.com> Fri Aug 11 13:52:06 2017 +0200
committer Tomáš Kukrál <tkukral@mirantis.com> Fri Aug 11 13:52:06 2017 +0200
tree 959669a257297e89f7f5dfb1c2762ac9cbbd4b9b
parent c401d589bbc0f1ab7fc2bb11960e54bfeb7306d2

fix tempest test runs

Change-Id: Ibbebf615a818ba45fad95021191f63574c453b3d

test-service.groovy

diff --git a/test-service.groovy b/test-service.groovy
index c9221d0..cdaaa8f 100644
--- a/test-service.groovy
+++ b/test-service.groovy
@@ -77,20 +77,16 @@
         }
 
         if (common.checkContains('TEST_SERVICE', 'openstack')) {
-            // if (common.checkContains('TEST_DOCKER_INSTALL', 'true')) {
-            //     test.install_docker(saltMaster, TEST_TEMPEST_TARGET)
-            // }
-            // stage('Run OpenStack tests') {
-            //     test.runTempestTests(saltMaster, TEST_TEMPEST_IMAGE, TEST_TEMPEST_TARGET, TEST_TEMPEST_PATTERN)
-            // }
+            if (common.checkContains('TEST_DOCKER_INSTALL', 'true')) {
+                test.install_docker(saltMaster, TEST_TEMPEST_TARGET)
+            }
 
-            //stage('Copy Tempest results to config node') {
-            //    test.copyTempestResults(saltMaster, TEST_TEMPEST_TARGET)
-            //
+            stage('Run OpenStack tests') {
+                test.runTempestTests(saltMaster, TEST_TEMPEST_IMAGE, TEST_TEMPEST_TARGET, TEST_TEMPEST_PATTERN)
+            }
 
             writeFile(file: 'report.xml', text: salt.getFileContent(saltMaster, TEST_TEMPEST_TARGET, '/root/report.xml')
             junit(keepLongStdio: true, testResults: 'report.xml', healthScaleFactor, TEST_JUNIT_RATIO)
-
         }
 
     } catch (Throwable e) {