diff options
| author | David Mulder <dmulder@suse.com> | 2022-03-03 14:07:50 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2022-04-07 17:37:30 +0000 |
| commit | 8d62b7aca71fc20017e950ac4ec372324b907803 (patch) | |
| tree | b7f78d5578f1e6cf7a68ccbaaa0329fd5b1f14a2 | |
| parent | b6d416205b2880356852715f4fb49adf8d756bbc (diff) | |
| download | samba-8d62b7aca71fc20017e950ac4ec372324b907803.tar.gz | |
ci: Create samba-fileserver-without-smb1 environment
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
| -rw-r--r-- | .gitlab-ci-main.yml | 18 | ||||
| -rwxr-xr-x | script/autobuild.py | 20 |
2 files changed, 38 insertions, 0 deletions
diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml index fa73fbd05e5..3ac0e772576 100644 --- a/.gitlab-ci-main.yml +++ b/.gitlab-ci-main.yml @@ -288,6 +288,15 @@ samba-h5l-build: - job: samba-h5l-build artifacts: true +samba-without-smb1-build: + extends: .shared_template_build_only + +.needs_samba-without-smb1-build: + extends: .shared_template_test_only + needs: + - job: samba-without-smb1-build + artifacts: true + samba-nt4-build: extends: .shared_template_build_only @@ -417,6 +426,11 @@ samba-fips: - .needs_samba-h5l-build - .private_test_only +.needs_samba-without-smb1-build-private: + extends: + - .needs_samba-without-smb1-build + - .private_test_only + .needs_samba-nt4-build-private: extends: - .needs_samba-nt4-build @@ -430,6 +444,9 @@ samba-fips: samba-fileserver: extends: .needs_samba-h5l-build-private +samba-fileserver-without-smb1: + extends: .needs_samba-without-smb1-build-private + # This is a full build without the AD DC so we test the build with MIT # Kerberos from the default system (Ubuntu 18.04 at this stage). # Runtime behaviour checked via the ktest (static ccache and keytab) @@ -485,6 +502,7 @@ pages: - samba-ad-back1 - samba-ad-back2 - samba-fileserver + - samba-fileserver-without-smb1 - samba-ad-dc-1 - samba-nt4 - samba-schemaupgrade diff --git a/script/autobuild.py b/script/autobuild.py index b72b6f7125c..d309fa0e97c 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -270,6 +270,16 @@ tasks = { ], }, + "samba-without-smb1-build": { + "git-clone-required": True, + "sequence": [ + ("configure", "./configure.developer --without-smb1-server --without-ad-dc" + samba_configure_params), + ("make", "make -j"), + ("check-clean-tree", CLEAN_SOURCE_TREE_CMD), + ("chmod-R-a-w", "chmod -R a-w ."), + ], + }, + "samba-no-opath-build": { "git-clone-required": True, "sequence": [ @@ -451,6 +461,16 @@ tasks = { ], }, + "samba-fileserver-without-smb1": { + "dependency": "samba-without-smb1-build", + "sequence": [ + ("random-sleep", random_sleep(300, 900)), + ("test", make_test(include_envs=["fileserver"])), + ("lcov", LCOV_CMD), + ("check-clean-tree", CLEAN_SOURCE_TREE_CMD), + ], + }, + # This is a full build without the AD DC so we test the build with # MIT Kerberos from the current system. Runtime behaviour is # confirmed via the ktest (static ccache and keytab) environment |