Minor fixes for test_k8s_chain_update
Fix downloading path of combined xml report and
add sleep() to prevent network collapse on ctl01
Change-Id: If9a3f275a5ac8d74660b90fd981937f2d1d69e3b
Related-PROD: PROD-20720
diff --git a/tcp_tests/fixtures/k8s_fixtures.py b/tcp_tests/fixtures/k8s_fixtures.py
index 7ec1a19..08176fc 100644
--- a/tcp_tests/fixtures/k8s_fixtures.py
+++ b/tcp_tests/fixtures/k8s_fixtures.py
@@ -179,14 +179,15 @@
for version in chain_versions:
container_name = "k8s-conformance:{}".format(version)
tmp_report_dir = "/root/report_{}".format(version)
- report_path = "/root/report_{}.xml".format(version)
+ report_path = "report_{}.xml".format(version)
conformance_log_path = "k8s_conformance_{}.log".format(version)
k8s_deployed.extract_file_to_node(
system='docker', container=container_name,
out_dir=tmp_report_dir, file_path='report'
)
- k8s_deployed.combine_xunit(tmp_report_dir, report_path)
+ k8s_deployed.combine_xunit(tmp_report_dir,
+ '/root/{}'.format(report_path))
k8s_deployed.download_k8s_logs(
[report_path, conformance_log_path])
diff --git a/tcp_tests/tests/system/test_k8s_actions.py b/tcp_tests/tests/system/test_k8s_actions.py
index a8dbe72..ab57efc 100644
--- a/tcp_tests/tests/system/test_k8s_actions.py
+++ b/tcp_tests/tests/system/test_k8s_actions.py
@@ -13,6 +13,7 @@
# under the License.
import pytest
+import time
from tcp_tests import logger
from tcp_tests import settings
@@ -106,6 +107,9 @@
sample_service_ip = k8s_deployed.get_svc_ip(deployment_name, 'default')
k8s_deployed.wait_deploy_ready(deployment_name)
+ # workaround for PROD-20720
+ time.sleep(30)
+
def check_is_test_service_available():
assert "Hello Kubernetes!" in k8s_deployed.curl(
"http://{}:{}".format(sample_service_ip, 8080))