summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2020-03-12 13:43:45 +1300
committerAndreas Schneider <asn@cryptomilk.org>2020-03-23 13:02:32 +0000
commitfb2918bb048349e6793a17f2f6c35f96e033ab0f (patch)
tree604380b7b6bbf4b1f498af823bffb3823e01273a /.gitlab-ci.yml
parent607c9ab307db36aee0604d209a13b45d28c63d9b (diff)
downloadsamba-fb2918bb048349e6793a17f2f6c35f96e033ab0f.tar.gz
.gitlab-ci.yml: Move the short samba-xc job into "others"
This job is over in 8mins total and much of that is spent setting up. It can safely be combined with the others in "others" Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml17
1 files changed, 7 insertions, 10 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f8275959118..8e71868bc64 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -105,12 +105,13 @@ include:
others:
extends: .shared_template
script:
- - script/autobuild.py ldb $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
- - script/autobuild.py pidl $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
- - script/autobuild.py replace $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
- - script/autobuild.py talloc $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
- - script/autobuild.py tdb $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
- - script/autobuild.py tevent $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
+ - script/autobuild.py ldb $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
+ - script/autobuild.py pidl $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
+ - script/autobuild.py replace $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
+ - script/autobuild.py talloc $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
+ - script/autobuild.py tdb $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
+ - script/autobuild.py tevent $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
+ - script/autobuild.py samba-xc $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
samba:
extends: .shared_template
@@ -124,9 +125,6 @@ samba-nopython:
samba-nopython-py2:
extends: .shared_template
-samba-xc:
- extends: .shared_template
-
samba-admem:
extends: .shared_template
@@ -220,7 +218,6 @@ pages:
- samba-mitkrb5
- samba-nopython
- samba-nopython-py2
- - samba-xc
- samba-admem
- samba-ad-dc-2
- samba-ad-dc-3