From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Wed, 5 Oct 2022 09:21:49 +0000 (+0200)
Subject: Enforce container-runtime remote if unset
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=4c2151e94b0d92855ad00c8fc6a48555a5d516cf;p=functest-kubernetes.git

Enforce container-runtime remote if unset

It was set by Jenkins by the past.
Remote as default value prevents the following issues:

[Fail] [sig-node] RuntimeClass [It] should run a Pod requesting a RuntimeClass with scheduling without taints
/workspace/src/k8s.io/kubernetes/_output/dockerized/go/src/k8s.io/kubernetes/test/e2e/node/runtimeclass.go:157

Change-Id: I5bd11b50053e5bc3e7fb04a864a4e7fe29826bc1
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---

diff --git a/functest_kubernetes/k8stest.py b/functest_kubernetes/k8stest.py
index bbfc5376..acf6b473 100644
--- a/functest_kubernetes/k8stest.py
+++ b/functest_kubernetes/k8stest.py
@@ -67,6 +67,8 @@ class E2ETesting(testcase.TestCase):
         for key, value in self.convert_ini_to_dict(
                 os.environ.get("E2E_TEST_OPTS", "")).items():
             cmd_line.extend(['-{}'.format(key), value])
+        if '-container-runtime' not in cmd_line:
+            cmd_line.extend(['-container-runtime', 'remote'])
         if "NON_BLOCKING_TAINTS" in os.environ:
             cmd_line.extend(
                 ['-non-blocking-taints', os.environ["NON_BLOCKING_TAINTS"]])