commit 4302bddf203a094a34c34a7ed65eee204bd41207
author Jiri Broulik <jbroulik@mirantis.com> Wed Aug 01 09:41:52 2018 +0000
committer Gerrit Code Review <gerrit2@84b5d06f6116> Wed Aug 01 09:41:52 2018 +0000
tree b049e278eefb20b398879841b509227580b33068
parent 185c5b70193196628a1c03d717f4a1683a698c64
parent 1c435304e661aecbd1d145377013732a7175ae92

Merge "fix compute setup  with ceph role"

cvp-func.groovy

diff --git a/cvp-func.groovy b/cvp-func.groovy
index 94f3eeb..d1fff1a 100644
--- a/cvp-func.groovy
+++ b/cvp-func.groovy
@@ -35,7 +35,7 @@
             sh "rm -rf ${artifacts_dir}"
             salt.cmdRun(saltMaster, TARGET_NODE, "rm -rf ${remote_artifacts_dir}")
             salt.cmdRun(saltMaster, TARGET_NODE, "mkdir -p ${remote_artifacts_dir}")
-            validate.configureContainer(saltMaster, TARGET_NODE, PROXY, TOOLS_REPO, TEMPEST_REPO, TEMPEST_ENDPOINT_TYPE, TEMPEST_VERSION)
+            validate.configureContainer(saltMaster, TARGET_NODE, PROXY, TOOLS_REPO, TEMPEST_REPO, TEMPEST_ENDPOINT_TYPE)
         }
 
         stage('Run Tempest tests') {

validate-cloud.groovy

diff --git a/validate-cloud.groovy b/validate-cloud.groovy
index 503b375..7d3b2e2 100644
--- a/validate-cloud.groovy
+++ b/validate-cloud.groovy
@@ -49,7 +49,7 @@
 
 def pepperEnv = "pepperEnv"
 def artifacts_dir = 'validation_artifacts/'
-if (!env.JOB_TIMEOUT){
+if (env.JOB_TIMEOUT == ''){
     job_timeout = 12
 } else {
     job_timeout = env.JOB_TIMEOUT.toInteger()