diff options
| author | Andreas Schneider <asn@samba.org> | 2021-08-03 13:20:40 +0200 |
|---|---|---|
| committer | Jule Anger <janger@samba.org> | 2021-08-06 14:49:17 +0000 |
| commit | 047cbaad5d9fa4bc6d901fece9a284de4f991fb3 (patch) | |
| tree | 4b67774d7441a234a3d273688c8a3e9db2e4c5fb | |
| parent | f2b2ecec7fc848ce474771ea5a7dcfad08ff392e (diff) | |
| download | samba-047cbaad5d9fa4bc6d901fece9a284de4f991fb3.tar.gz | |
gitlab: Use shorter names for Samba AD DC env with MIT KRB5
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14779
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Tue Aug 3 20:35:49 UTC 2021 on sn-devel-184
(cherry picked from commit 000f389d09ec9e9906d5e2a0aa317c471c5f5b96)
| -rw-r--r-- | .gitlab-ci-main.yml | 12 | ||||
| -rwxr-xr-x | script/autobuild.py | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml index 1aee591b068..0979c007dc6 100644 --- a/.gitlab-ci-main.yml +++ b/.gitlab-ci-main.yml @@ -331,10 +331,10 @@ samba-ad-dc-ntvfs: samba-admem-mit: extends: .needs_samba-mit-build -samba-ad-dc-4a-mitkrb5: +samba-addc-mit-4a: extends: .needs_samba-mit-build -samba-ad-dc-4b-mitkrb5: +samba-addc-mit-4b: extends: .needs_samba-mit-build # This task is run first to ensure we compile before we start the @@ -389,7 +389,7 @@ samba-ad-dc-1: samba-nt4: extends: .needs_samba-nt4-build-private -samba-ad-dc-1-mitkrb5: +samba-addc-mit-1: extends: .needs_samba-mit-build-private samba-no-opath1: @@ -421,15 +421,15 @@ pages: - samba-ctdb - samba-ad-dc-ntvfs - samba-admem-mit - - samba-ad-dc-4a-mitkrb5 - - samba-ad-dc-4b-mitkrb5 + - samba-addc-mit-4a + - samba-addc-mit-4b - samba-ad-back1 - samba-ad-back2 - samba-fileserver - samba-ad-dc-1 - samba-nt4 - samba-schemaupgrade - - samba-ad-dc-1-mitkrb5 + - samba-addc-mit-1 - samba-fips - samba-no-opath1 - samba-no-opath2 diff --git a/script/autobuild.py b/script/autobuild.py index 85dff88a773..c554c331da4 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -655,7 +655,7 @@ tasks = { ], }, - "samba-ad-dc-1-mitkrb5": { + "samba-addc-mit-1": { "dependency": "samba-mit-build", "sequence": [ ("random-sleep", random_sleep(1, 1)), @@ -671,7 +671,7 @@ tasks = { ], }, - "samba-ad-dc-4a-mitkrb5": { + "samba-addc-mit-4a": { "dependency": "samba-mit-build", "sequence": [ ("random-sleep", random_sleep(1, 1)), @@ -684,7 +684,7 @@ tasks = { ("check-clean-tree", CLEAN_SOURCE_TREE_CMD), ], }, - "samba-ad-dc-4b-mitkrb5": { + "samba-addc-mit-4b": { "dependency": "samba-mit-build", "sequence": [ ("random-sleep", random_sleep(1, 1)), |