summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2020-12-29 01:19:31 +0100
committerStefan Metzmacher <metze@samba.org>2021-04-13 08:23:35 +0000
commita786ff99677bd22dc0499a01027f003bf8bfae27 (patch)
tree3173e9a448ccd1032787020a8dd93109ed7fbd38
parent63853b823c6a263c69c06f91163bcada4f3646c9 (diff)
downloadsamba-a786ff99677bd22dc0499a01027f003bf8bfae27.tar.gz
.gitlab-ci.yml: move samba-ad-back{1,2} and samba-schemaupgrade to shared runners
This seems to work quite reliable now. Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Andreas Schneider <asn@samba.org>
-rw-r--r--.gitlab-ci.yml18
1 files changed, 9 insertions, 9 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b1ccf49484b..f74c8052101 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -284,6 +284,15 @@ samba-ad-dc-5:
samba-ad-dc-6:
extends: .needs_samba-def-build
+samba-ad-back1:
+ extends: .needs_samba-def-build
+
+samba-ad-back2:
+ extends: .needs_samba-def-build
+
+samba-schemaupgrade:
+ extends: .needs_samba-def-build
+
samba-libs:
extends: .shared_template
@@ -350,12 +359,6 @@ samba-fips:
- .needs_samba-no-opath-build
- .private_runner
-samba-ad-back1:
- extends: .needs_samba-def-build-private
-
-samba-ad-back2:
- extends: .needs_samba-def-build-private
-
samba-fileserver:
extends: .needs_samba-h5l-build-private
@@ -365,9 +368,6 @@ samba-ad-dc-1:
samba-nt4:
extends: .needs_samba-nt4-build-private
-samba-schemaupgrade:
- extends: .needs_samba-def-build-private
-
samba-ad-dc-1-mitkrb5:
extends: .needs_samba-mit-build-private