Revert "Remove hardcode for tempest version"
Change workflow for cvp-job
Oleksii Zhurba, Denis Meltsaykin and I desided that all custom settings in cvp jobs should be taked out from jenkins parameters.
These custom values (e.g. version of tempest) will be indicated in bash script from 'cvp-configuration' repository
This reverts commit 742c49c468c4bf6ed59c1e1fe4f615e3e2d6b97e.
Change-Id: I40d4ef44c36a5d348ceb3610af9c565a1a4b3f3d
diff --git a/src/com/mirantis/mcp/Validate.groovy b/src/com/mirantis/mcp/Validate.groovy
index a345165..43d1869 100644
--- a/src/com/mirantis/mcp/Validate.groovy
+++ b/src/com/mirantis/mcp/Validate.groovy
@@ -210,7 +210,7 @@
salt.runSaltProcessStep(master, target, 'file.mkdir', ["${results}", "mode=777"])
def _pillar = salt.getPillar(master, 'I@keystone:server', 'keystone:server')
def keystone = _pillar['return'][0].values()[0]
- def env_vars = ["tempest_version=${version}",
+ def env_vars = ['tempest_version=15.0.0',
"OS_USERNAME=${keystone.admin_name}",
"OS_PASSWORD=${keystone.admin_password}",
"OS_TENANT_NAME=${keystone.admin_tenant}",
@@ -222,7 +222,7 @@
cmd = "git clone -b ${confBranch ?: 'master'} ${confRepository} test_config; " +
'rally deployment create --fromenv --name=tempest; rally deployment config; ' +
'rally verify create-verifier --name tempest_verifier --type tempest ' +
- "--source ${repository ?: '/tmp/tempest/'} --version ${version}; " +
+ "--source ${repository ?: '/tmp/tempest/'} --version ${version: '15.0.0'}; " +
'rally verify configure-verifier --extend test_config/tempest/tempest.conf --show; '
skip_list = '--skip-list test_config/tempest/skip-list.yaml'
}