commit 39b21eadbf2063db1a9b6cc67d4eccc2baa0f25a
author Dennis Dmitriev <dis.xcom@gmail.com> Fri May 25 12:45:13 2018 +0000
committer Gerrit Code Review <support@gerrithub.io> Fri May 25 12:45:13 2018 +0000
tree 205103609fc512f749bb4b40167556107cae47c8
parent 82456e07d601d7e7a241d2cac1202b8ba2adf671
parent 2687fa1f680fd1ec1cfdd9fe6bfe10cb847e3915

Merge "Bump k8s to 1.8.13 and add pause image vars"

tcp_tests/managers/k8smanager.py

diff --git a/tcp_tests/managers/k8smanager.py b/tcp_tests/managers/k8smanager.py
index 4a822d7..7476b60 100644
--- a/tcp_tests/managers/k8smanager.py
+++ b/tcp_tests/managers/k8smanager.py
@@ -608,7 +608,7 @@
         """
         with self.__underlay.remote(node_name=self.ctl_host) as r:
             cmd = ("apt-get install python-setuptools -y; "
-                   "pip install xunitmerge")
+                   "pip install git+https://github.com/mogaika/xunitmerge.git")
             LOG.debug('Installing xunitmerge')
             r.check_call(cmd)
             LOG.debug('Merging xunit')

tcp_tests/templates/shared-salt.yaml

diff --git a/tcp_tests/templates/shared-salt.yaml b/tcp_tests/templates/shared-salt.yaml
index 442f892..653eef9 100644
--- a/tcp_tests/templates/shared-salt.yaml
+++ b/tcp_tests/templates/shared-salt.yaml
@@ -1094,7 +1094,7 @@
 
 - description: Run tempest from new docker image
   cmd: |
-    docker run -e ARGS="-r {{TEMPEST_PATTERN }} -w 4 {{ EXCLUDE_TEST_ARGS }}" -v /root/test/tempest.conf:/etc/tempest/tempest.conf -v /tmp/:/tmp/ -v /root/test:/root/tempest -v /etc/ssl/certs/:/etc/ssl/certs/ --rm docker-prod-virtual.docker.mirantis.net/mirantis/cicd/ci-tempest /bin/bash -c "run-tempest"
+    docker run -e ARGS="-r {{TEMPEST_PATTERN }} -w 2 {{ EXCLUDE_TEST_ARGS }}" -v /root/test/tempest.conf:/etc/tempest/tempest.conf -v /tmp/:/tmp/ -v /root/test:/root/tempest -v /etc/ssl/certs/:/etc/ssl/certs/ --rm docker-prod-virtual.docker.mirantis.net/mirantis/cicd/ci-tempest /bin/bash -c "run-tempest"
   node_name: {{ HOSTNAME_GTW01 }}
   retry: {count: 1, delay: 30}
   skip_fail: true