commit a5fff2cce324a52b84a8f5519292d499844ef563
author Hanna Arhipova <harhipova@mirantis.com> Tue Feb 11 22:27:26 2020 +0200
committer harhipova <harhipova@mirantis.com> Wed Feb 12 12:31:15 2020 +0000
tree 8e2cfc001e71b8ccd9ce3a4ce8cc6950b7384a3b
parent b8575e6c020281bf20751397b1263bbc25968fa8

Switch CVP tests to tox

Change-Id: I8707af448ec80e8b6e40582d14eacbd3dc9ac032
Related-Prod:#PROD-34723(PROD:34723)

cvp-runner.groovy

diff --git a/cvp-runner.groovy b/cvp-runner.groovy
index f6ec27b..f0e17b4 100644
--- a/cvp-runner.groovy
+++ b/cvp-runner.groovy
@@ -47,14 +47,13 @@
         withEnv(env_vars) {
             stage('Initialization') {
                 def container_workdir = '/var/lib'
-                def workdir = "${container_workdir}/${test_suite_name}"
                 def tests_set = (env.getProperty('tests_set')) ?: ''
                 def script = "pytest --junitxml ${container_workdir}/${artifacts_dir}/${xml_file} -vv ${tests_set}"
 
                 sh "mkdir -p ${artifacts_dir}"
 
                 // Enrichment for docker commands
-                def commands = EXTRA_PARAMS.get("commands") ?: ['010_start_tests': "cd ${workdir} && with_venv.sh ${script}"]
+                def commands = EXTRA_PARAMS.get("commands") ?: ['010_start_tests': "tox -e ${test_suite_name} -- ${script}"]
                 def commands_list = commands.collectEntries{ [ (it.key) : { sh("${it.value}") } ] }
 
                 // Enrichment for env variables