summaryrefslogtreecommitdiff
path: root/.gitlab-ci-main.yml
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2021-08-16 13:52:04 +1200
committerJule Anger <janger@samba.org>2021-09-08 12:32:11 +0000
commit1dd8ded8c576e427c2d0432e4317071e6ff0f1ea (patch)
treeb1be67e94666339d803f6f44ef2748af9d9a1377 /.gitlab-ci-main.yml
parent961bdab6647753c1d9512e803321ff3b7a281bdd (diff)
downloadsamba-1dd8ded8c576e427c2d0432e4317071e6ff0f1ea.tar.gz
gitlab-ci: Move MIT builds to current Fedora so we can test against a current MIT KDC
Fedora packages current MIT builds pretty fast so we base our MIT KDC tests there, as this avoids backporting and tests against the most current code. Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Andreas Schneider <asn@samba.org> BUG: https://bugzilla.samba.org/show_bug.cgi?id=14817 (cherry picked from commit 649b0741e17909afce762a5b84c1231600eec5f0)
Diffstat (limited to '.gitlab-ci-main.yml')
-rw-r--r--.gitlab-ci-main.yml6
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index 0ac6f67fcdf..ce80561ba0f 100644
--- a/.gitlab-ci-main.yml
+++ b/.gitlab-ci-main.yml
@@ -234,10 +234,14 @@ samba-def-build:
samba-mit-build:
extends: .shared_template_build_only
+ variables:
+ SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora34}
stage: build_first
.needs_samba-mit-build:
extends: .shared_template_test_only
+ variables:
+ SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora34}
needs:
- job: samba-mit-build
artifacts: true
@@ -274,6 +278,8 @@ samba:
samba-mitkrb5:
extends: .shared_template
+ variables:
+ SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora34}
samba-minimal-smbd:
extends: .shared_template