X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest_kubernetes%2Fk8stest.py;h=bbfc5376678fe8eb109ca7b3aef63a7d52f31ad0;hb=b100b1254e06719bf1c779b9d53d0ac2da67fca4;hp=09dc50e8f7738805ad51c44b9de1fdc7f782e97c;hpb=63b56cf0740fd5e2e0b7b022e287b27ddb898dee;p=functest-kubernetes.git diff --git a/functest_kubernetes/k8stest.py b/functest_kubernetes/k8stest.py index 09dc50e8..bbfc5376 100644 --- a/functest_kubernetes/k8stest.py +++ b/functest_kubernetes/k8stest.py @@ -19,42 +19,73 @@ import os import re import subprocess import time +import yaml from xtesting.core import testcase -class K8sTesting(testcase.TestCase): +class E2ETesting(testcase.TestCase): """Kubernetes test runner""" # pylint: disable=too-many-instance-attributes __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(K8sTesting, self).__init__(**kwargs) + super().__init__(**kwargs) self.cmd = [] - self.res_dir = "/home/opnfv/functest/results/{}".format( - self.case_name) + self.dir_results = "/home/opnfv/functest/results" + self.res_dir = os.path.join(self.dir_results, self.case_name) self.result = 0 self.start_time = 0 self.stop_time = 0 self.output_log_name = 'functest-kubernetes.log' self.output_debug_log_name = 'functest-kubernetes.debug.log' - def run_kubetest(self): # pylint: disable=too-many-branches + @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 = self.cmd + cmd_line = [ + 'ginkgo', '--nodes={}'.format(kwargs.get("nodes", 1)), + '--noColor', '/usr/local/bin/e2e.test', '--', + '-kubeconfig', self.config, + '-provider', kwargs.get('provider', 'local'), + '-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) - - process = subprocess.Popen(cmd_line, stdout=subprocess.PIPE, - stderr=subprocess.STDOUT) - boutput = process.stdout.read() - with open(os.path.join(self.res_dir, 'e2e.log'), 'wb') as foutput: - foutput.write(boutput) + env = os.environ.copy() + 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'), 'w', encoding='utf-8') as foutput: + foutput.write(boutput.decode("utf-8")) grp = re.search( r'^(FAIL|SUCCESS)!.* ([0-9]+) Passed \| ([0-9]+) Failed \|' - r' ([0-9]+) Pending \| ([0-9]+) Skipped', boutput.decode("utf-8"), + r' ([0-9]+) Pending \| ([0-9]+) Skipped', + boutput.decode("utf-8", errors="ignore"), re.MULTILINE | re.DOTALL) assert grp self.details['passed'] = int(grp.group(2)) @@ -68,19 +99,22 @@ class K8sTesting(testcase.TestCase): self.__logger.debug("result: %s", self.result) if grp.group(1) == 'FAIL': grp2 = re.search( - r'^(Summarizing [0-9]+ Failure.*)Ran', boutput.decode("utf-8"), + r'^(Summarizing [0-9]+ Failure.*)Ran', + boutput.decode("utf-8", errors="ignore"), re.MULTILINE | re.DOTALL) if grp2: 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") return self.EX_RUN_ERROR self.start_time = time.time() try: - self.run_kubetest() + self.run_kubetest(**kwargs) res = self.EX_OK except Exception: # pylint: disable=broad-except self.__logger.exception("Error with running kubetest:") @@ -88,27 +122,31 @@ class K8sTesting(testcase.TestCase): self.stop_time = time.time() return res - -class K8sSmokeTest(K8sTesting): - """Kubernetes smoke test suite""" - def __init__(self, **kwargs): - if "case_name" not in kwargs: - kwargs.get("case_name", 'k8s_smoke') - super(K8sSmokeTest, self).__init__(**kwargs) - self.cmd = ['e2e.test', '-ginkgo.focus', 'Guestbook.application', - '-ginkgo.noColor', '-kubeconfig', self.config, - '-provider', 'local', '-report-dir', self.res_dir, - '-disable-log-dump', 'true'] - - -class K8sConformanceTest(K8sTesting): - """Kubernetes conformance test suite""" - def __init__(self, **kwargs): - if "case_name" not in kwargs: - kwargs.get("case_name", 'k8s_conformance') - super(K8sConformanceTest, self).__init__(**kwargs) - self.cmd = [ - 'e2e.test', '-ginkgo.focus', r'\[Conformance\]', '-ginkgo.noColor', - '-ginkgo.skip', r'Alpha|\[(Disruptive|Feature:[^\]]+|Flaky)\]', - '-kubeconfig', self.config, '-provider', 'local', - '-report-dir', self.res_dir, '-disable-log-dump', 'true'] + 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', encoding='utf-8') as file: + yaml.dump(repo_list, file)