Use KUBE_SERVER_VERSION to report k8s_conformance results
Use the file './env_k8s_version' which is created after
conformance tests, as a bash source file to get the variable
KUBE_SERVER_VERSION and use it for reporting to TestRail
to the correct test suite.
Change-Id: I2131f47a541cb9acfc18c5ea29fc71e5194886bd
diff --git a/jobs/pipelines/swarm-testrail-report.groovy b/jobs/pipelines/swarm-testrail-report.groovy
index f31db14..3da7c04 100644
--- a/jobs/pipelines/swarm-testrail-report.groovy
+++ b/jobs/pipelines/swarm-testrail-report.groovy
@@ -106,10 +106,8 @@
// TODO(ddmitriev): it's better to get the k8s version right after deployment
// and store in some artifact that can be re-used here.
def k8s_version=shared.run_cmd_stdout("""\
- export ENV_NAME=${ENV_NAME}
- . ./tcp_tests/utils/env_salt
- . ./tcp_tests/utils/env_k8s
- echo "\$kubernetes_version_major.\$kubernetes_version_minor"
+ . ./env_k8s_version;
+ echo "\$KUBE_SERVER_VERSION"
""").trim().split().last()
testSuiteName = "[MCP][k8s]Hyperkube ${k8s_version}.x"
methodname = "{methodname}"