Revert "Fix runtestmanager for CICD deployments"
This reverts commit 70cefed6f2de0d31eaeadff55713bec5e3d763d8.
Change-Id: Ie9087cda7102b2bfd4d0e1b5d4dacc66cc4648be
diff --git a/jobs/pipelines/swarm-run-pytest.groovy b/jobs/pipelines/swarm-run-pytest.groovy
index 5d7bd8d..553b8a2 100644
--- a/jobs/pipelines/swarm-run-pytest.groovy
+++ b/jobs/pipelines/swarm-run-pytest.groovy
@@ -36,16 +36,9 @@
dir("${PARENT_WORKSPACE}") {
try {
- if (env.TCP_QA_REFS) {
- stage("Update working dir to patch ${TCP_QA_REFS}") {
- shared.update_working_dir()
- }
- }
-
stage("Run tests") {
def steps = shared.get_steps_list(PASSED_STEPS)
def sources = """\
- cd ${PARENT_WORKSPACE}
export ENV_NAME=${ENV_NAME}
. ./tcp_tests/utils/env_salt"""
if (steps.contains('k8s')) {
@@ -59,7 +52,7 @@
def installed = steps.collect {"""\
export ${it}_installed=true"""}.join("\n")
- shared.run_sh(sources + installed + """
+ shared.run_cmd(sources + installed + """
export TESTS_CONFIGS=${ENV_NAME}_salt_deployed.ini
export MANAGER=devops # use 'hardware' fixture to manage fuel-devops environment
export salt_master_host=\$SALT_MASTER_IP # skip salt_deployed fixture
@@ -75,7 +68,7 @@
}
} catch (e) {
- common.printMsg("Job is failed", "red")
+ common.printMsg("Job is failed" + e.message, "red")
throw e
} finally {
// TODO(ddmitriev): analyze the "def currentResult = currentBuild.result ?: 'SUCCESS'"