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 ed63c08db05ef1490a04be5fe787c5f7e0cfe14e..757b3420874555170b3458d48a386f627cf5cadc 100644 (file)
--- 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 9a3cded48bb8c794fab0ee0d6a3ad6a2f7104e38..0bfbf7d29a7794d2efa82498ce6ed815c2a8a306 100644 (file)
--- 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 2c8c3f5408d7f2dce15af7aa1dcabd7015426708..25678251c5bd8390526183f8fa18636001bb3f81 100644 (file)
--- 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}"