From 6208e4c78a80ebb29d7f073ee78e20e98c8d9a15 Mon Sep 17 00:00:00 2001
From: Vladimir Khlyunev <vkhlyunev@mirantis.com>
Date: Mon, 27 Jun 2022 15:06:49 +0400
Subject: [PATCH] Update git clone ssh

Change-Id: Ia1fdbe96515d409959f03d8cc959c2117f22cd4b
---
 maintenance-ci/mos/reporter-docker/Dockerfile         | 11 ++++++++++-
 .../mos/scripts/maintenance-tempest-report.sh         |  5 ++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/maintenance-ci/mos/reporter-docker/Dockerfile b/maintenance-ci/mos/reporter-docker/Dockerfile
index cc99b3d..f39361c 100644
--- a/maintenance-ci/mos/reporter-docker/Dockerfile
+++ b/maintenance-ci/mos/reporter-docker/Dockerfile
@@ -19,14 +19,23 @@ RUN apt-get install -y python3.7
 
 WORKDIR /root
 
+ARG KEY_FILE_VARIABLE
+ARG SSH_USER_NAME_VARIABLE
+
 COPY $KEY_FILE_VARIABLE /root/.ssh/id_rsa
 RUN chmod 600 /root/.ssh/id_rsa
 
+RUN echo 'Host *' > /root/.ssh/config \
+    && echo '    StrictHostKeyChecking no' >> /root/.ssh/config
+
+
 RUN virtualenv --python=python3.7 report-venv  \
     && source report-venv/bin/activate \
     && eval "$(ssh-agent)" \
     && ssh-add \
-    && pip install git+ssh://${SSH_USER_NAME_VARIABLE}@gerrit.mcp.mirantis.com:29418/mcp/testrail-reporter
+    && git clone ssh://${SSH_USER_NAME_VARIABLE}@gerrit.mcp.mirantis.com:29418/mcp/testrail-reporter \
+    && cd testrail-reporter \
+    && python setup.py install
 
 
 COPY run_report.sh /root/run_report.sh
diff --git a/maintenance-ci/mos/scripts/maintenance-tempest-report.sh b/maintenance-ci/mos/scripts/maintenance-tempest-report.sh
index 2567825..be2637a 100644
--- a/maintenance-ci/mos/scripts/maintenance-tempest-report.sh
+++ b/maintenance-ci/mos/scripts/maintenance-tempest-report.sh
@@ -55,7 +55,10 @@ rm -rf "${LOCAL_STORAGE}"
 mkdir -p "${LOCAL_STORAGE}"
 cp "${REPORT_FILE}" "${LOCAL_STORAGE}"
 cp "${KEY_FILE_VARIABLE}" maintenance-ci/mos/reporter-docker
-IMAGE_ID=$(docker build -q maintenance-ci/mos/reporter-docker)
+KEY_FILE_VARIABLE=$(basename "${KEY_FILE_VARIABLE}")
+pushd maintenance-ci/mos/reporter-docker
+  IMAGE_ID=$(docker build -q --build-arg KEY_FILE_VARIABLE --build-arg SSH_USER_NAME_VARIABLE .)
+popd
 docker run -e SSH_USER_NAME_VARIABLE -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="${ARGS[*]}" -e REPORT_FILE="$(basename ${REPORT_FILE})" \
     --rm -v "${LOCAL_STORAGE}":/root/shared "${IMAGE_ID}"
-- 
2.45.2