From f8662a478325ab281337c8705fd85e8c3f17c04d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Wieczorek?= Date: Wed, 5 Mar 2025 10:47:14 +0100 Subject: [PATCH] config: Drop KVer Schedule, Job and Test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Paweł Wieczorek --- config/jobs.yaml | 6 ---- config/runtime/kver.jinja2 | 73 -------------------------------------- config/scheduler.yaml | 7 +--- 3 files changed, 1 insertion(+), 85 deletions(-) delete mode 100644 config/runtime/kver.jinja2 diff --git a/config/jobs.yaml b/config/jobs.yaml index 1ca73cb1f..688a91a2d 100644 --- a/config/jobs.yaml +++ b/config/jobs.yaml @@ -1686,12 +1686,6 @@ jobs: params: arch: x86_64 - kver: - template: kver.jinja2 - kind: test - image: kernelci/{image_prefix}kernelci - kcidb_test_suite: kernelci_kver - ltp-cap-bounds: <<: *ltp-job params: diff --git a/config/runtime/kver.jinja2 b/config/runtime/kver.jinja2 deleted file mode 100644 index b1b534f02..000000000 --- a/config/runtime/kver.jinja2 +++ /dev/null @@ -1,73 +0,0 @@ -{# -*- mode: Python -*- -#} -{# SPDX-License-Identifier: LGPL-2.1-or-later -#} - -{%- extends 'base/python.jinja2' %} - -{%- block python_globals %} -{{ super() }} -REVISION = {{ node.data.kernel_revision }} -{% endblock %} - -{% block python_job_constr -%} -REVISION, {{ super() }} -{%- endblock %} - -{% block python_job -%} -class Job(BaseJob): - - def __init__(self, revision, *args, **kwargs): - super().__init__(*args, **kwargs) - self._revision = revision - - def _get_makefile_version(self, makefile): - mkver = { - 'VERSION': None, - 'PATCHLEVEL': None, - 'SUBLEVEL': None, - 'EXTRAVERSION': None, - } - for line_n, line in enumerate(makefile): - value = list(val.strip() for val in line.split('=')) - for key in mkver.keys(): - if value[0] == key: - mkver[key] = ( - int(value[1]) if key != 'EXTRAVERSION' else value[1] - ) - res = [val is not None for val in mkver.values()] - if all(res): - return mkver - if line_n == 10: - return None - return None - - def _check_kver(self, makefile, kver): - try: - mkver = self._get_makefile_version(makefile) - except Exception as e: - print(e) - mkver = None - finally: - if mkver is None: - return False - - return ( - kver['version'] == mkver['VERSION'] and - kver['patchlevel'] == mkver['PATCHLEVEL'] and ( - not mkver['SUBLEVEL'] or - kver['sublevel'] == mkver['SUBLEVEL'] - ) and ( - not mkver['EXTRAVERSION'] or - kver['extra'].startswith(mkver['EXTRAVERSION']) - ) - ) - - def _run(self, src_path): - print("Checking kernel revision") - with open(os.path.join(src_path, 'Makefile')) as makefile: - kver = self._revision['version'] - res = self._check_kver(makefile, kver) - result = 'pass' if res is True else 'fail' - print(f"Result: {result}") - - return result -{% endblock %} diff --git a/config/scheduler.yaml b/config/scheduler.yaml index 24cc4ef63..8da4f239d 100644 --- a/config/scheduler.yaml +++ b/config/scheduler.yaml @@ -964,11 +964,6 @@ scheduler: runtime: name: k8s-gke-eu-west4 - - job: kver - event: *checkout-event - runtime: - type: shell - - job: ltp-cap-bounds event: *kbuild-gcc-12-arm-node-event runtime: *lava-broonie-runtime @@ -1428,4 +1423,4 @@ scheduler: <<: *job-event name: blktests-ddp-x86 runtime: - type: shell \ No newline at end of file + type: shell