From b1e83b6cede6ad50e417a6cff583a9ab25f8c980 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 14 Sep 2023 10:42:55 +0200 Subject: [PATCH] .gitlab-ci: make it explicit that some tests require ext4/5.15 kernel This is better then requiring private runners, as we'll be able to use shared runners for ext4 soon. Signed-off-by: Stefan Metzmacher Reviewed-by: Andrew Bartlett --- .gitlab-ci-default-runners.yml | 4 +-- .gitlab-ci-main.yml | 61 +++++++++++++++++++++++----------- 2 files changed, 44 insertions(+), 21 deletions(-) diff --git a/.gitlab-ci-default-runners.yml b/.gitlab-ci-default-runners.yml index 2dea6e82c49..f73f868d39c 100644 --- a/.gitlab-ci-default-runners.yml +++ b/.gitlab-ci-default-runners.yml @@ -23,8 +23,8 @@ # # # Our current private runner 'docker', 'samba-ci-private', 'shared' and -# 'ubuntu1804'. It runs with an ubuntu1804 kernel and privides an ext4 filesystem -# and similar RAM as the n1-standard-2 runners. +# 'ubuntu2204'. It runs with an ubuntu2204 kernel (5.15) and provides an +# ext4 filesystem and similar RAM as the n1-standard-2 runners. # .shared_runner_build: diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml index 5cb6f656663..99dd25e264c 100644 --- a/.gitlab-ci-main.yml +++ b/.gitlab-ci-main.yml @@ -409,41 +409,64 @@ samba-codecheck: # settings -> CI/CD -> Environment variables - if: $SUPPORT_PRIVATE_TEST == "yes" -.needs_samba-def-build-private: +.needs_ext4_support: + # Our private runners provide an ext4 filesystem + extends: .private_test_only + +.needs_5_15_kernel: + # Our private runners are based on + # ubuntu2204 with a 5.15 kernel. + # + # And they also provide an ext4 filesystem + extends: .private_test_only + +.needs_samba-def-build-ext4: extends: - .needs_samba-def-build - - .private_test_only + - .needs_ext4_support -.needs_samba-mit-build-private: +.needs_samba-mit-build-ext4: extends: - .needs_samba-mit-build - - .private_test_only + - .needs_ext4_support -.needs_samba-h5l-build-private: +.needs_samba-h5l-build-ext4: extends: - .needs_samba-h5l-build - - .private_test_only + - .needs_ext4_support -.needs_samba-without-smb1-build-private: +.needs_samba-without-smb1-build-5_15: + # Currently this doesn't strictly + # require a kernel >= 5.15, but only + # ext4 support. + # + # But we want to make sure that + # our private runners keep working + # and at least do a single job. + # + # In future we'll be able to run + # tests with io_uring in this + # setup, which will requires a + # 5.15 kernel in order to be useful. extends: - .needs_samba-without-smb1-build - - .private_test_only + - .needs_5_15_kernel -.needs_samba-nt4-build-private: +.needs_samba-nt4-build-ext4: extends: - .needs_samba-nt4-build - - .private_test_only + - .needs_ext4_support -.needs_samba-no-opath-build-private: +.needs_samba-no-opath-build-ext4: extends: - .needs_samba-no-opath-build - - .private_test_only + - .needs_ext4_support samba-fileserver: - extends: .needs_samba-h5l-build-private + extends: .needs_samba-h5l-build-ext4 samba-fileserver-without-smb1: - extends: .needs_samba-without-smb1-build-private + extends: .needs_samba-without-smb1-build-5_15 # This is a full build without the AD DC so we test the build with MIT # Kerberos from the default system (Ubuntu 22.04 at this stage). @@ -453,19 +476,19 @@ samba-ktest-mit: extends: .shared_template samba-ad-dc-1: - extends: .needs_samba-def-build-private + extends: .needs_samba-def-build-ext4 samba-nt4: - extends: .needs_samba-nt4-build-private + extends: .needs_samba-nt4-build-ext4 samba-addc-mit-1: - extends: .needs_samba-mit-build-private + extends: .needs_samba-mit-build-ext4 samba-no-opath1: - extends: .needs_samba-no-opath-build-private + extends: .needs_samba-no-opath-build-ext4 samba-no-opath2: - extends: .needs_samba-no-opath-build-private + extends: .needs_samba-no-opath-build-ext4 # 'pages' is a special job which can publish artifacts in `public` dir to gitlab pages pages: -- 2.47.3