X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest_kubernetes%2Fk8stest.py;h=b450dac48fce5c6dd9b00f16be074e626fae9ffd;hb=refs%2Fchanges%2F11%2F72811%2F3;hp=35649edcc022aafc6212c2bdb72cc8f3d428c61c;hpb=65d860c6ee36641ad7d248f7dc8a6f63f3173301;p=functest-kubernetes.git

diff --git a/functest_kubernetes/k8stest.py b/functest_kubernetes/k8stest.py
index 35649edc..b450dac4 100644
--- a/functest_kubernetes/k8stest.py
+++ b/functest_kubernetes/k8stest.py
@@ -19,6 +19,7 @@ import os
 import re
 import subprocess
 import time
+import yaml
 
 from xtesting.core import testcase
 
@@ -30,9 +31,11 @@ class E2ETesting(testcase.TestCase):
     __logger = logging.getLogger(__name__)
 
     config = '/root/.kube/config'
+    gcr_repo = os.getenv("MIRROR_REPO", "gcr.io")
+    k8s_gcr_repo = os.getenv("MIRROR_REPO", "k8s.gcr.io")
 
     def __init__(self, **kwargs):
-        super(E2ETesting, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.cmd = []
         self.dir_results = "/home/opnfv/functest/results"
         self.res_dir = os.path.join(self.dir_results, self.case_name)
@@ -42,22 +45,39 @@ class E2ETesting(testcase.TestCase):
         self.output_log_name = 'functest-kubernetes.log'
         self.output_debug_log_name = 'functest-kubernetes.debug.log'
 
+    @staticmethod
+    def convert_ini_to_dict(value):
+        "Convert oslo.conf input to dict"
+        assert isinstance(value, str)
+        try:
+            return dict((x.rsplit(':', 1) for x in value.split(',')))
+        except ValueError:
+            return {}
+
     def run_kubetest(self, **kwargs):  # pylint: disable=too-many-branches
         """Run the test suites"""
-        cmd_line = ['e2e.test', '-ginkgo.noColor', '-kubeconfig', self.config,
-                    '-provider', 'local', '-report-dir', self.res_dir]
-        for arg in kwargs:
-            cmd_line.extend(['-ginkgo.{}'.format(arg), kwargs.get(arg)])
+        cmd_line = [
+            'ginkgo', '--nodes={}'.format(kwargs.get("nodes", 1)),
+            '--noColor', '/usr/local/bin/e2e.test', '--',
+            '-kubeconfig', self.config,
+            '-provider', 'skeleton', '-report-dir', self.res_dir]
+        for arg in kwargs.get("ginkgo", {}):
+            cmd_line.extend(['-ginkgo.{}'.format(arg), kwargs["ginkgo"][arg]])
+        for key, value in self.convert_ini_to_dict(
+                os.environ.get("E2E_TEST_OPTS", "")).items():
+            cmd_line.extend(['-{}'.format(key), value])
         if "NON_BLOCKING_TAINTS" in os.environ:
             cmd_line.extend(
                 ['-non-blocking-taints', os.environ["NON_BLOCKING_TAINTS"]])
         cmd_line.extend(['-disable-log-dump', 'true'])
+        self._generate_repo_list_file()
         self.__logger.info("Starting k8s test: '%s'.", cmd_line)
         env = os.environ.copy()
-        env["GINKGO_PARALLEL"] = 'y'
-        process = subprocess.Popen(cmd_line, stdout=subprocess.PIPE,
-                                   stderr=subprocess.STDOUT, env=env)
-        boutput = process.stdout.read()
+        env["KUBE_TEST_REPO_LIST"] = "{}/repositories.yml".format(self.res_dir)
+        with subprocess.Popen(
+                cmd_line, stdout=subprocess.PIPE,
+                stderr=subprocess.STDOUT, env=env) as process:
+            boutput = process.stdout.read()
         with open(os.path.join(self.res_dir, 'e2e.log'), 'wb') as foutput:
             foutput.write(boutput)
         grp = re.search(
@@ -84,6 +104,8 @@ class E2ETesting(testcase.TestCase):
                 self.__logger.error(grp2.group(1))
 
     def run(self, **kwargs):
+        if not os.path.exists(self.res_dir):
+            os.makedirs(self.res_dir)
         if not os.path.isfile(self.config):
             self.__logger.error(
                 "Cannot run k8s testcases. Config file not found")
@@ -97,3 +119,31 @@ class E2ETesting(testcase.TestCase):
             res = self.EX_RUN_ERROR
         self.stop_time = time.time()
         return res
+
+    def _generate_repo_list_file(self):
+        """Generate the repositories list for the test."""
+        # The list is taken from
+        # https://github.com/kubernetes/kubernetes/blob/master/test/utils/image/manifest.go
+        # It may needs update regularly
+        gcr_repo = os.getenv("GCR_REPO", self.gcr_repo)
+        k8s_gcr_repo = os.getenv("K8S_GCR_REPO", self.k8s_gcr_repo)
+        repo_list = {
+            "GcAuthenticatedRegistry": "{}/authenticated-image-pulling".format(
+                gcr_repo),
+            "E2eRegistry":             "{}/kubernetes-e2e-test-images".format(
+                gcr_repo),
+            "PromoterE2eRegistry":     "{}/e2e-test-images".format(
+                k8s_gcr_repo),
+            "BuildImageRegistry":      "{}/build-image".format(k8s_gcr_repo),
+            "InvalidRegistry":         "invalid.com/invalid",
+            "GcEtcdRegistry":          "{}".format(k8s_gcr_repo),
+            "GcRegistry":              "{}".format(k8s_gcr_repo),
+            "SigStorageRegistry":      "{}/sig-storage".format(k8s_gcr_repo),
+            "PrivateRegistry":         "{}/k8s-authenticated-test".format(
+                gcr_repo),
+            "SampleRegistry":          "{}/google-samples".format(gcr_repo),
+            "GcrReleaseRegistry":      "{}/gke-release".format(gcr_repo),
+            "MicrosoftRegistry":       "mcr.microsoft.com",
+        }
+        with open("{}/repositories.yml".format(self.res_dir), 'w') as file:
+            yaml.dump(repo_list, file)