From cfe389c1fb593a747c23b1f28434025c2353af33 Mon Sep 17 00:00:00 2001
From: Vladimir Khlyunev <vkhlyunev@mirantis.com>
Date: Wed, 13 Apr 2022 14:30:09 +0400
Subject: [PATCH] Change env var handling

Change-Id: I313f5fa0221098eb2210c5ac7f97b91311957103
---
 maintenance-ci/mos/reporter-docker/run_report.sh     |  9 +++------
 .../mos/scripts/maintenance-tempest-report.sh        | 12 +++---------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/maintenance-ci/mos/reporter-docker/run_report.sh b/maintenance-ci/mos/reporter-docker/run_report.sh
index 410b87b..cbbe702 100644
--- a/maintenance-ci/mos/reporter-docker/run_report.sh
+++ b/maintenance-ci/mos/reporter-docker/run_report.sh
@@ -2,9 +2,6 @@
 
 source report-venv/bin/activate
 
-echo ${ARG_STR}
-echo "${ARG_STR}"
-report "${ARG_STR}"
-
-deactivate
-
+report -v --testrail-plan-name "${TESTRAIL_PLAN_NAME?}" --env-description "${SPECIFICATION?}" --testrail-user "${TESTRAIL_USER?}" \
+          --testrail-password "${TESTRAIL_PASSWORD?}" --testrail-project "${TESTRAIL_PROJECT?}" --testrail-milestone "${MILESTONE?}" \
+          --testrail-suite "${TESTRAIL_SUITE?}" --test-results-link "${TEST_BUILD_URL}" "${ARGS[@]}" "/root/shared/${REPORT_FILE?}"
diff --git a/maintenance-ci/mos/scripts/maintenance-tempest-report.sh b/maintenance-ci/mos/scripts/maintenance-tempest-report.sh
index fee75d8..9c7787c 100644
--- a/maintenance-ci/mos/scripts/maintenance-tempest-report.sh
+++ b/maintenance-ci/mos/scripts/maintenance-tempest-report.sh
@@ -50,14 +50,8 @@ rm -rf "${LOCAL_STORAGE}"
 mkdir -p "${LOCAL_STORAGE}"
 cp "${REPORT_FILE}" "${LOCAL_STORAGE}"
 
-arg_str="-v --testrail-plan-name \"${TESTRAIL_PLAN_NAME?}\" --env-description \"${SPECIFICATION?}\" --testrail-user \"${TESTRAIL_USER?}\" \
-          --testrail-password \"${TESTRAIL_PASSWORD?}\" --testrail-project \"${TESTRAIL_PROJECT?}\" --testrail-milestone \"${MILESTONE?}\" \
-          --testrail-suite \"${TESTRAIL_SUITE?}\" --test-results-link \"${TEST_BUILD_URL}\" "
-if [ ! ${#ARGS[@]} -eq 0 ] ; then
-  arg_str="${arg_str} \"${ARGS[*]}\" "
-fi
-arg_str="${arg_str} \"/root/shared/${REPORT_FILE?}\" "
-
 IMAGE_ID=$(docker build -q maintenance-ci/mos/reporter-docker)
-docker run -e ARG_STR="${arg_str}" --rm -v "${LOCAL_STORAGE}":/root/shared "${IMAGE_ID}"
+docker run -e TESTRAIL_PLAN_NAME -e SPECIFICATION -e TESTRAIL_USER -e TESTRAIL_PASSWORD \
+    -e TESTRAIL_PROJECT -e MILESTONE -e TESTRAIL_SUITE -e TEST_BUILD_URL -e ARGS -e REPORT_FILE \
+    --rm -v "${LOCAL_STORAGE}":/root/shared "${IMAGE_ID}"
 docker rmi "${IMAGE_ID}"
-- 
2.45.2