summaryrefslogtreecommitdiff
path: root/.gitlab-ci-main.yml
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2021-08-16 13:52:04 +1200
committerAndreas Schneider <asn@cryptomilk.org>2021-08-26 06:16:35 +0000
commit649b0741e17909afce762a5b84c1231600eec5f0 (patch)
tree44b9d20fb12a35adc839e5c0f36d308f4b11593f /.gitlab-ci-main.yml
parent6145c388d201d817444322dee67ca1ec1989ecd1 (diff)
downloadsamba-649b0741e17909afce762a5b84c1231600eec5f0.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>
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