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

diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index 9ea3a3f560673e9db005d06986cb2a7f03b73649..657b28e274ff5b623ef7a35af6564c818710cc70 100644 (file)
--- 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 7ec3073f67e5aecd13d8947948fca130a89b0cea..efecaf41d74a9c4ae7914dc761134b00ddac55fa 100755 (executable)
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -659,7 +659,7 @@ tasks = {
         ],
     },
 
-    "samba-ad-dc-1-mitkrb5": {
+    "samba-addc-mit-1": {
         "dependency": "samba-mit-build",
         "sequence": [
             ("random-sleep", random_sleep(1, 1)),
@@ -675,7 +675,7 @@ tasks = {
         ],
     },
 
-    "samba-ad-dc-4a-mitkrb5": {
+    "samba-addc-mit-4a": {
         "dependency": "samba-mit-build",
         "sequence": [
             ("random-sleep", random_sleep(1, 1)),
@@ -688,7 +688,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)),