diff --git a/config/kernelci.toml b/config/kernelci.toml index 4edaa6056..24a799649 100644 --- a/config/kernelci.toml +++ b/config/kernelci.toml @@ -7,6 +7,7 @@ verbose = true poll_period = 0 startup_delay = 3 timeout = 60 +force = 1 [tarball] kdir = "/home/kernelci/data/src/linux" diff --git a/config/pipeline.yaml b/config/pipeline.yaml index 7eb840cd5..6a9cd4cc4 100644 --- a/config/pipeline.yaml +++ b/config/pipeline.yaml @@ -169,73 +169,73 @@ jobs: # template: 'fstests.jinja2' # image: 'kernelci/staging-kernelci' - baseline-arm64: *baseline-job - baseline-arm64-chromebook: *baseline-job - baseline-x86: *baseline-job - baseline-x86-board: *baseline-job - baseline-x86-board-staging: *baseline-job - - kbuild-gcc-10-arm64: - <<: *kbuild-gcc-10-arm64-job - - kbuild-gcc-10-arm64-chromebook: - <<: *kbuild-gcc-10-arm64-job - params: - <<: *kbuild-gcc-10-arm64-params - cross_compile_compat: 'arm-linux-gnueabihf-' - fragments: ['arm64-chromebook'] - - kbuild-gcc-10-arm: - <<: *kbuild-job - image: kernelci/staging-gcc-10:arm64-kselftest-kernelci - params: - arch: arm - compiler: gcc-10 - cross_compile: 'arm-linux-gnueabihf-' - defconfig: defconfig - - kbuild-gcc-10-i386: - <<: *kbuild-job - image: kernelci/staging-gcc-10:x86-kselftest-kernelci - params: - arch: i386 - compiler: gcc-10 - defconfig: i386_defconfig - - kbuild-gcc-10-riscv: - <<: *kbuild-job - image: kernelci/staging-gcc-10:riscv64-kselftest-kernelci - params: - arch: riscv - compiler: gcc-10 - cross_compile: 'riscv64-linux-gnu-' - defconfig: defconfig - - kbuild-gcc-10-x86: - <<: *kbuild-gcc-10-x86-job - - kbuild-gcc-10-x86-board: - <<: *kbuild-gcc-10-x86-job - params: - <<: *kbuild-gcc-10-x86-params - fragments: ['x86-board'] - - kbuild-gcc-10-x86-chromeos: - <<: *kbuild-gcc-10-x86-job - params: - <<: *kbuild-gcc-10-x86-params - defconfig: allnoconfig - fragments: ['x86-board','cros://chromeos-6.1/x86_64/chromeos-intel-pineview.flavour.config','CONFIG_MODULE_COMPRESS=n'] - - kunit: &kunit-job - template: kunit.jinja2 - kind: test - image: kernelci/staging-gcc-10:x86-kunit-kernelci - - kunit-x86_64: - <<: *kunit-job - params: - arch: x86_64 + # baseline-arm64: *baseline-job + # baseline-arm64-chromebook: *baseline-job + # baseline-x86: *baseline-job + # baseline-x86-board: *baseline-job + # baseline-x86-board-staging: *baseline-job + + # kbuild-gcc-10-arm64: + # <<: *kbuild-gcc-10-arm64-job + + # kbuild-gcc-10-arm64-chromebook: + # <<: *kbuild-gcc-10-arm64-job + # params: + # <<: *kbuild-gcc-10-arm64-params + # cross_compile_compat: 'arm-linux-gnueabihf-' + # fragments: ['arm64-chromebook'] + + # kbuild-gcc-10-arm: + # <<: *kbuild-job + # image: kernelci/staging-gcc-10:arm64-kselftest-kernelci + # params: + # arch: arm + # compiler: gcc-10 + # cross_compile: 'arm-linux-gnueabihf-' + # defconfig: defconfig + + # kbuild-gcc-10-i386: + # <<: *kbuild-job + # image: kernelci/staging-gcc-10:x86-kselftest-kernelci + # params: + # arch: i386 + # compiler: gcc-10 + # defconfig: i386_defconfig + + # kbuild-gcc-10-riscv: + # <<: *kbuild-job + # image: kernelci/staging-gcc-10:riscv64-kselftest-kernelci + # params: + # arch: riscv + # compiler: gcc-10 + # cross_compile: 'riscv64-linux-gnu-' + # defconfig: defconfig + + # kbuild-gcc-10-x86: + # <<: *kbuild-gcc-10-x86-job + + # kbuild-gcc-10-x86-board: + # <<: *kbuild-gcc-10-x86-job + # params: + # <<: *kbuild-gcc-10-x86-params + # fragments: ['x86-board'] + + # kbuild-gcc-10-x86-chromeos: + # <<: *kbuild-gcc-10-x86-job + # params: + # <<: *kbuild-gcc-10-x86-params + # defconfig: allnoconfig + # fragments: ['x86-board','cros://chromeos-6.1/x86_64/chromeos-intel-pineview.flavour.config','CONFIG_MODULE_COMPRESS=n'] + + # kunit: &kunit-job + # template: kunit.jinja2 + # kind: test + # image: kernelci/staging-gcc-10:x86-kunit-kernelci + + # kunit-x86_64: + # <<: *kunit-job + # params: + # arch: x86_64 kver: template: kver.jinja2 @@ -476,31 +476,7 @@ build_configs: branch: 'master' variants: *build-variants - stable-rc_4.19: &stable-rc - tree: stable-rc - branch: 'linux-4.19.y' - variants: *build-variants - - stable-rc_5.4: - <<: *stable-rc - branch: 'linux-5.4.y' - - stable-rc_5.10: - <<: *stable-rc - branch: 'linux-5.10.y' - - stable-rc_5.15: - <<: *stable-rc - branch: 'linux-5.15.y' - - stable-rc_6.1: - <<: *stable-rc - branch: 'linux-6.1.y' - stable-rc_6.6: - <<: *stable-rc + tree: stable-rc branch: 'linux-6.6.y' - - stable-rc_6.7: - <<: *stable-rc - branch: 'linux-6.7.y' + variants: *build-variants diff --git a/config/runtime/kver.jinja2 b/config/runtime/kver.jinja2 index 35275761d..b1b534f02 100644 --- a/config/runtime/kver.jinja2 +++ b/config/runtime/kver.jinja2 @@ -51,10 +51,10 @@ class Job(BaseJob): return False return ( - int(kver['version']) == mkver['VERSION'] and - int(kver['patchlevel']) == mkver['PATCHLEVEL'] and ( + kver['version'] == mkver['VERSION'] and + kver['patchlevel'] == mkver['PATCHLEVEL'] and ( not mkver['SUBLEVEL'] or - int(kver['sublevel']) == mkver['SUBLEVEL'] + kver['sublevel'] == mkver['SUBLEVEL'] ) and ( not mkver['EXTRAVERSION'] or kver['extra'].startswith(mkver['EXTRAVERSION'])