diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2020-09-11 10:35:58 +1200 |
|---|---|---|
| committer | Douglas Bagnall <dbagnall@samba.org> | 2020-10-01 01:18:38 +0000 |
| commit | 8557a52937e3a3319fa4bd9b18af792cee9ec528 (patch) | |
| tree | 6805854e6b3a9e74cad5bd8d4063581d1d890701 /.gitlab-ci.yml | |
| parent | a9186829eb2b2365a91d870d8c04fe3506366f18 (diff) | |
| download | samba-8557a52937e3a3319fa4bd9b18af792cee9ec528.tar.gz | |
autobuild.py: Combine samba-static and samba-nopython
We expect these will complete in under an hour and reduce the number of
parallel jobs. Hopefully there will be some ccache hits between these
as well.
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c9bc00c4ddf..6c2e0cabe9a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -133,7 +133,7 @@ samba: samba-mitkrb5: extends: .shared_template -samba-nopython: +samba-minimal-smbd: extends: .shared_template samba-nopython-py2: @@ -160,9 +160,6 @@ samba-ad-dc-6: samba-libs: extends: .shared_template -samba-static: - extends: .shared_template - samba-fuzz: extends: .shared_template image: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-ubuntu1604:${SAMBA_CI_CONTAINER_TAG} @@ -228,7 +225,6 @@ pages: - others - samba - samba-mitkrb5 - - samba-nopython - samba-nopython-py2 - samba-admem - samba-ad-dc-2 @@ -237,7 +233,7 @@ pages: - samba-ad-dc-5 - samba-ad-dc-6 - samba-libs - - samba-static + - samba-minimal-smbd - samba-fuzz # - ctdb # TODO - samba-ctdb |