From: Vladimir Khlyunev <vkhlyunev@mirantis.com>
Date: Mon, 27 Jun 2022 09:43:24 +0000 (+0400)
Subject: Use gerrit-based testrail reporter
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F71%2F41971%2F4;p=tools%2Fsustaining.git

Use gerrit-based testrail reporter

Change-Id: I43585c567df086ba9e09f9a9f08311cf9a7ee344
---

diff --git a/maintenance-ci/mos/jobs/maintenance-tempest-report.yaml b/maintenance-ci/mos/jobs/maintenance-tempest-report.yaml
index ed63c08..757b342 100644
--- a/maintenance-ci/mos/jobs/maintenance-tempest-report.yaml
+++ b/maintenance-ci/mos/jobs/maintenance-tempest-report.yaml
@@ -51,6 +51,10 @@
             credential-id: testrail_credentials
             username: TESTRAIL_USER
             password: TESTRAIL_PASSWORD
+        - ssh-user-private-key:
+            credential-id: maintenance-ci-robot
+            key-file-variable: KEY_FILE_VARIABLE
+            username-variable: SSH_USER_NAME_VARIABLE
     scm:
     - git:
         url: 'https://review.fuel-infra.org/tools/sustaining/'
diff --git a/maintenance-ci/mos/reporter-docker/Dockerfile b/maintenance-ci/mos/reporter-docker/Dockerfile
index 9a3cded..0bfbf7d 100644
--- a/maintenance-ci/mos/reporter-docker/Dockerfile
+++ b/maintenance-ci/mos/reporter-docker/Dockerfile
@@ -19,11 +19,13 @@ RUN apt-get install -y python3.7
 
 WORKDIR /root
 
+COPY $KEY_FILE_VARIABLE /root/.ssh/id_rsa
+RUN chmod 600 /root/.ssh/id_rsa
+
 RUN virtualenv --python=python3.7 report-venv  \
     && source report-venv/bin/activate \
-    && git clone https://github.com/dis-xcom/testrail_reporter.git  \
-    && cd testrail_reporter \
-    && python setup.py install
+    && pip install git+ssh://${SSH_USER_NAME_VARIABLE}@gerrit.mcp.mirantis.com:29418/mcp/testrail-reporter
+
 
 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 2c8c3f5..2567825 100644
--- a/maintenance-ci/mos/scripts/maintenance-tempest-report.sh
+++ b/maintenance-ci/mos/scripts/maintenance-tempest-report.sh
@@ -46,13 +46,17 @@ fi
 
 export TEST_BUILD_URL
 export TESTRAIL_PLAN_NAME
+export KEY_FILE_VARIABLE
+export SSH_USER_NAME_VARIABLE
+
 
 LOCAL_STORAGE="$(pwd)"/shared
 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)
-docker run -e TESTRAIL_PLAN_NAME -e SPECIFICATION -e TESTRAIL_USER -e TESTRAIL_PASSWORD \
+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}"
 docker rmi "${IMAGE_ID}"